date:20120823

 sc/inc/dpcache.hxx  |1 +
 sd/source/ui/remotecontrol/BufferedStreamSocket.cxx |4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b1932b7a182d99a52b8c2fb71d2d48a61ce47423
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Thu Aug 23 10:43:37 2012 +0300

send()/recv() on sockets (instead of write()/read()) for Windows portability

Change-Id: Ifaa890d87021c7786c7392f52d4f29b0779a7668

diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx 
b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
index 2b65970..0733db4 100644
--- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
+++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
@@ -52,7 +52,7 @@ sal_Int32 BufferedStreamSocket::write( const void* pBuffer, 
sal_uInt32 n )
 if ( !usingCSocket )
 return StreamSocket::write( pBuffer, n );
 else
-return ::write( mSocket, pBuffer, (size_t) n );
+return ::send( mSocket, pBuffer, (size_t) n, 0 );
 }
 
 sal_Int32 BufferedStreamSocket::readLine( OString aLine )
@@ -79,7 +79,7 @@ sal_Int32 BufferedStreamSocket::readLine( OString aLine )
 if ( !usingCSocket)
 aRet = StreamSocket::recv( aBuffer[aRead], 100 );
 else
-aRet = ::read( mSocket, aBuffer[aRead], 100 );
+aRet = ::recv( mSocket, aBuffer[aRead], 100, 0 );
 
 if ( aRet == 0 )
 {
commit c439fad7d6802ae6df8b91ffaf964f083a6d7eea
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Thu Aug 23 10:40:27 2012 +0300

WaE: class has virtual functions and accessible non-virtual destructor

Change-Id: I0fdc966a1dab68fb642ab581ad3f4eb6762363e0

diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index d68f348..7f996e0 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -108,6 +108,7 @@ public:
 virtual bool next() = 0;
 virtual void finish() = 0;
 virtual void getValue(long nCol, ScDPItemData rData, short rNumType) 
const = 0;
+virtual ~DBConnector() { };
 };
 
 private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [GSOC-UPDATE](22.08) Impress Remote

Hi Andrzej,

On Wed, 2012-08-22 at 23:26 +0200, Andrzej J. R. Hunt wrote:
 Bluetooth control on Linux is now working.

Nice work ! :-)

 The new code isn't particularly tidy yet, I'm still sorting out the 
 details -- I've also had to somewhat hack my socket buffering to work 
 with both osl and C sockets (previously I had a buffer wrapping the 
 osl::StreamSocket) -- would it be appropriate to eventually incorporate 
 bluetooth sockets into osl ?

Yes; clearly having our system-abstraction code in sal/ makes lots of
sense - as long as we don't bust our layering too badly.

 Control of other bluetooth functions is all separate from that and done 
 via dbus.)

I guess this will need some platform abstraction API goodness too, but
- this is great work.

Thanks,

Michael.

PS. don't forget to file your GSOC evaluation  create a big
tar-ball of patches :-)
PPS. did you poke ux-advise wrt. a pretty icon for your remote ?
-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

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

[Libreoffice-commits] .: sw/source

 sw/source/ui/docvw/HeaderFooterWin.cxx |   11 ---
 sw/source/ui/docvw/edtwin.cxx  |  105 +++--
 sw/source/ui/inc/HeaderFooterWin.hxx   |1 
 sw/source/ui/inc/edtwin.hxx|3 
 sw/source/ui/wrtsh/wrtsh1.cxx  |6 -
 5 files changed, 91 insertions(+), 35 deletions(-)

New commits:
commit 3d7927152169474c3c73ac36d5d79008fe6bab3e
Author: CÃ©dric Bosdonnat cedric.bosdon...@free.fr
Date:   Thu Aug 23 09:45:10 2012 +0200

fdo#46141: Don't use a timer to show header/footer separators

Clicking on the header/footer area will show the separator. Clicking on
an empty header/footer area will add a temporary one that we try hard to
remove when clicking outside

Change-Id: I8f29f8fd80b2d808257636bf94ec4e2e46f6028e

diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx 
b/sw/source/ui/docvw/HeaderFooterWin.cxx
index 23b2892..9e4bc27 100644
--- a/sw/source/ui/docvw/HeaderFooterWin.cxx
+++ b/sw/source/ui/docvw/HeaderFooterWin.cxx
@@ -152,7 +152,6 @@ SwHeaderFooterWin::SwHeaderFooterWin( SwEditWin* pEditWin, 
const SwPageFrm* pPag
 m_pLine( NULL ),
 m_bIsAppearing( false ),
 m_nFadeRate( 100 ),
-m_nDelayAppearing( 0 ),
 m_aFadeTimer( )
 {
 // Get the font and configure it
@@ -243,8 +242,6 @@ void SwHeaderFooterWin::ShowAll( bool bShow )
 if ( !PopupMenu::IsInExecute() )
 {
 m_bIsAppearing = bShow;
-if ( bShow )
-m_nDelayAppearing = 0;
 
 if ( m_aFadeTimer.IsActive( ) )
 m_aFadeTimer.Stop();
@@ -515,14 +512,6 @@ void SwHeaderFooterWin::Select( )
 
 IMPL_LINK_NOARG(SwHeaderFooterWin, FadeHandler)
 {
-const int TICKS_BEFORE_WE_APPEAR = 10;
-if ( m_bIsAppearing  m_nDelayAppearing  TICKS_BEFORE_WE_APPEAR )
-{
-++m_nDelayAppearing;
-m_aFadeTimer.Start();
-return 0;
-}
-
 if ( m_bIsAppearing  m_nFadeRate  0 )
 m_nFadeRate -= 25;
 else if ( !m_bIsAppearing  m_nFadeRate  100 )
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index e3b3933..bf24d48 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -93,6 +93,7 @@
 #include fmtornt.hxx
 #include fmtfsize.hxx
 #include fmtclds.hxx
+#include fmthdft.hxx
 #include frmfmt.hxx
 #include modcfg.hxx
 #include fmtcol.hxx
@@ -1323,6 +1324,13 @@ void SwEditWin::KeyInput(const KeyEvent rKEvt)
 rSh.IsHeaderFooterEdit( ) )
 {
 bool bHeader = FRMTYPE_HEADER  rSh.GetFrmType(0,sal_False);
+
+// Remove the temporary header/footer
+if ( !m_sTmpHFPageStyle.isEmpty() )
+{
+rSh.ChangeHeaderOrFooter( m_sTmpHFPageStyle, m_bTmpHFIsHeader, 
false, false );
+}
+
 if ( bHeader )
 rSh.SttPg();
 else
@@ -1330,6 +1338,10 @@ void SwEditWin::KeyInput(const KeyEvent rKEvt)
 rSh.ToggleHeaderFooterEdit();
 }
 
+// If we are inputing a key in a temporary header/footer, then make it 
definitive
+if ( !m_sTmpHFPageStyle.isEmpty( ) )
+m_sTmpHFPageStyle = rtl::OUString( );
+
 SfxObjectShell *pObjSh = 
(SfxObjectShell*)rView.GetViewFrame()-GetObjectShell();
 if ( bLockInput || (pObjSh  pObjSh-GetProgress()) )
 // When the progress bar is active or a progress is
@@ -2675,9 +2687,57 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
 
 const Point aDocPos( PixelToLogic( rMEvt.GetPosPixel() ) );
 
+FrameControlType eControl;
+bool bIsInHF = IsInHeaderFooter( aDocPos, eControl );
+if ( !m_sTmpHFPageStyle.isEmpty( ) )
+{
+// Are we clicking outside the temporary header/footer? if so remove it
+rtl::OUString sStyleName = rSh.GetCurPageStyle( false );
+bool bMatchesTmpHF = sStyleName == m_sTmpHFPageStyle 
+( ( m_bTmpHFIsHeader  eControl == Header ) ||
+  ( !m_bTmpHFIsHeader  eControl == Footer ) );
+
+if ( ( !bIsInHF  rSh.IsHeaderFooterEdit( ) ) || !bMatchesTmpHF )
+rSh.ChangeHeaderOrFooter( m_sTmpHFPageStyle, m_bTmpHFIsHeader, 
false, false );
+
+m_sTmpHFPageStyle = rtl::OUString( );
+}
+
+// Are we clicking on a blank header/footer area?
+if ( bIsInHF  !rSh.IsHeaderFooterEdit( ) )
+{
+// Create empty header/footer under the cursor and switch to it
+const SwPageFrm* pPageFrm = rSh.GetLayout()-GetPageAtPos( aDocPos );
+
+// Is it active?
+bool bActive = true;
+const SwPageDesc* pDesc = pPageFrm-GetPageDesc();
+
+const SwFrmFmt* pFmt = pDesc-GetLeftFmt();
+if ( pPageFrm-OnRightPage() )
+ pFmt = pDesc-GetRightFmt();
+
+if ( pFmt )
+{
+if ( eControl == Header )
+bActive = pFmt-GetHeader().IsActive();
+else
+bActive = pFmt-GetFooter().IsActive();
+}
+
+if ( !bActive )
+{
+const String rStyleName =

improving from address in gerrit emails to commits list?

2012-08-23 Thread Noel Grandin


Hi

Is it possible to munge the From: address in the gerrit emails that go 
to the commit list?


I got kind of used to seeing who did the commit in the from column of 
my email client, and I miss that :-)


Thanks,
   Noel Grandin



Disclaimer: http://www.peralex.com/disclaimer.html


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

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

 sc/source/core/data/dpcache.cxx|4 ++--
 sc/source/core/data/dpitemdata.cxx |5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 0ee1609ddc04f01e7398fab08d74529c301600e6
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Aug 22 23:33:14 2012 -0400

fdo#53929: Pivot table uses case insensitive string comparison.

Change-Id: I65fa22ceeba37a15b70fe41b1dee26f1dde7d759
Signed-off-by: Michael Meeks michael.me...@suse.com

diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index a11db55..f1e4531 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -282,7 +282,7 @@ struct EqualByValue : std::binary_functionBucket, Bucket, 
bool
 {
 bool operator() (const Bucket left, const Bucket right) const
 {
-return left.maValue == right.maValue;
+return left.maValue.IsCaseInsEqual(right.maValue);
 }
 };
 
@@ -338,7 +338,7 @@ void processBuckets(std::vectorBucket aBuckets, 
ScDPCache::Field rField)
 it-mnOrderIndex = nCurIndex;
 for (++it; it != itEnd; ++it)
 {
-if (aPrev != it-maValue)
+if (!aPrev.IsCaseInsEqual(it-maValue))
 ++nCurIndex;
 
 it-mnOrderIndex = nCurIndex;
diff --git a/sc/source/core/data/dpitemdata.cxx 
b/sc/source/core/data/dpitemdata.cxx
index 1641572..bb22894 100644
--- a/sc/source/core/data/dpitemdata.cxx
+++ b/sc/source/core/data/dpitemdata.cxx
@@ -210,8 +210,9 @@ bool ScDPItemData::IsCaseInsEqual(const ScDPItemData r) 
const
 ;
 }
 
-if (mbStringInterned  r.mbStringInterned)
-return mpString == r.mpString;
+if (mbStringInterned  r.mbStringInterned  mpString == r.mpString)
+// Fast equality check for interned strings.
+return true;
 
 return ScGlobal::GetpTransliteration()-isEqual(GetString(), 
r.GetString());
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: unusedcode.easy vcl/inc vcl/source vcl/unx

 unusedcode.easy |4 --
 vcl/inc/unx/salgdi.h|   13 --
 vcl/inc/vcl/alpha.hxx   |5 --
 vcl/source/gdi/alpha.cxx|   31 ---
 vcl/unx/generic/gdi/salgdi2.cxx |   80 
 5 files changed, 133 deletions(-)

New commits:
commit c564fdfe298d8f93e3f09f61dc01a152f57b6506
Author: Thomas Arnhold tho...@arnhold.org
Date:   Sat Aug 18 11:44:06 2012 +0200

unusedcode.easy: remove recently unused code

Change-Id: Ia33e933d9c15c2afa25915b7e8d6a13b0c740d1c
Reviewed-on: https://gerrit.libreoffice.org/426
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com

diff --git a/unusedcode.easy b/unusedcode.easy
index 136657f..e541859 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,6 +1,3 @@
-AlphaMask::Scale(Size const, unsigned long)
-AlphaMask::Scale(double const, double const, unsigned long)
-AlphaMask::ScaleCropRotate(double const, double const, Rectangle const, 
long, Color const, unsigned long)
 FontSelectPattern::FontSelectPattern(PhysicalFontFace const, Size const, 
float, int, bool)
 PopupMenu::SetSelectedEntry(unsigned short)
 SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, 
unsigned int, unsigned char)
@@ -20,7 +17,6 @@ VCLXPrinterServer::getImplementationId()
 VCLXPrinterServer::getTypes()
 VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(Size const, Fraction 
const, Point const, boost::shared_arrayunsigned char const)
 Window::PostUserEvent(unsigned long, unsigned long, void*)
-X11SalGraphics::Clip(int, int, unsigned int, unsigned int, int, int) 
const
 XclExpPivotCache::GetFieldAcc(rtl::OUString const)
 binfilter::ImpSvtData::~ImpSvtData()
 binfilter::PCodeBuffConvertorunsigned int, unsigned short::GetBuffer()
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 359d274..494a1dc 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -173,19 +173,6 @@ protected:
 inline  GC  GetCopyGC();
 inline  GC  GetStippleGC();
 
-int Clip  ( XLIB_Region   pRegion,
-int  nX,
-int  nY,
-unsigned int nDX,
-unsigned int nDY,
-int  nSrcX,
-int  nSrcY ) const;
-int Clip  ( int  nX,
-int  nY,
-unsigned int nDX,
-unsigned int nDY,
-int  nSrcX,
-int  nSrcY ) const;
 using SalGraphics::DrawBitmap;
 voidDrawBitmap( const SalTwoRect *pPosAry,
 SalGraphics  *pThis,
diff --git a/vcl/inc/vcl/alpha.hxx b/vcl/inc/vcl/alpha.hxx
index d0ceb92..f25cde5 100644
--- a/vcl/inc/vcl/alpha.hxx
+++ b/vcl/inc/vcl/alpha.hxx
@@ -123,11 +123,6 @@ public:
 sal_BoolReplace( sal_uInt8 cSearchTransparency, sal_uInt8 
cReplaceTransparency,
  sal_uLong nTol = 0UL );
 
-sal_Bool Scale( const Size rNewSize, sal_uLong nScaleFlag );
-sal_Bool Scale( const double rScaleX, const double rScaleY, sal_uLong 
nScaleFlag = BMP_SCALE_DEFAULT );
-sal_Bool ScaleCropRotate( const double rScaleX, const double rScaleY, 
const Rectangle rRectPixel, long nAngle10,
-  const Color rFillColor, sal_uLong nScaleFlag = 
BMP_SCALE_DEFAULT );
-
 BitmapReadAccess*   AcquireReadAccess()
 {
 return Bitmap::AcquireReadAccess();
diff --git a/vcl/source/gdi/alpha.cxx b/vcl/source/gdi/alpha.cxx
index 0c2ad36..985b13b 100644
--- a/vcl/source/gdi/alpha.cxx
+++ b/vcl/source/gdi/alpha.cxx
@@ -287,35 +287,4 @@ void AlphaMask::ReleaseAccess( BitmapReadAccess* pAccess )
 }
 }
 
-sal_Bool AlphaMask::Scale( const Size rNewSize, sal_uLong nScaleFlag )
-{
-sal_Bool bRet = Bitmap::Scale( rNewSize, nScaleFlag );
-
-if( bRet )
-Bitmap::Convert( BMP_CONVERSION_8BIT_GREYS );
-
-return bRet;
-}
-
-sal_Bool AlphaMask::Scale( const double rScaleX, const double rScaleY, 
sal_uLong nScaleFlag )
-{
-sal_Bool bRet = Bitmap::Scale( rScaleX, rScaleY, nScaleFlag );
-
-if( bRet )
-Bitmap::Convert( BMP_CONVERSION_8BIT_GREYS );
-
-return bRet;
-}
-
-sal_Bool AlphaMask::ScaleCropRotate(
-const double rScaleX, const double rScaleY, const Rectangle 
rRectPixel, long nAngle10,
-const Color rFillColor, sal_uLong  nScaleFlag  )
-{
-sal_Bool bRet = Bitmap::ScaleCropRotate( rScaleX, rScaleY, rRectPixel, 
nAngle10, rFillColor, nScaleFlag );
-if( bRet )
-Bitmap::Convert( BMP_CONVERSION_8BIT_GREYS );
-
-return bRet;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx

[PUSHED 3-6] Fix for fdo#53929 - Case insensitive strings in pivot table

Hi Kohei,

On Wed, 2012-08-22 at 23:39 -0400, Kohei Yoshida wrote:
 Another fix I'd like backported to 3-6 (and perhaps 3-6-1 if enough 
 people feel comfortable) is this

I love the unit test too :-)

 https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=1afd1e5ca8872253c491af76c70397fb9e00f900

Having said that - whenever I see the end of:

@@ -210,8 +210,9 @@ bool ScDPItemData::IsCaseInsEqual(const
ScDPItemData r) const
;
}

 if (mbStringInterned  r.mbStringInterned  mpString == r.mpString)
 // Fast equality check for interned strings.
 return true;

  return ScGlobal::GetpTransliteration()-isEqual(GetString(), r.GetString());
}

I hear a very heavy grinding sound as UNO infrastructure picks up
steam, and the combination with the i18n heavy-lifting there makes me
hear performance screaming from the users ringing in my ears [ I must
get some tablets for that ;-].

As such, throwing babies overboard to avoid calling isEqual() seems
like a good plan to me ;-) for a start - I'm interested in why we only
do a string equality comparison if these mbStringInterned things are
set; surely it's smaller and easier to just do the pointer compare:

if (mpString == r.mpString)

is just as good presumably ? except - with some more thinking:

Also, I wonder how often the data-pilot code will do this ? presumably
if we build a hash-table of strings we know are not equal (I guess the
DP has bucketing code for this already), it'd be far faster to look both
strings up in that bucket, detect they are not the same and then
exit ;-) [ assuming the bucket is constructed case-insensitively ].

Perhaps this was the function of the pre-existing check ? - if both
strings are case-sensitively interned in a hash, we be sure that they
are not equal if they are both in there, and the pointers don't match -
without the nightmare weight lifting ? :-)

Anyhow - I've pushed it to -3-6 since it clearly helps.

Thoughts ?

Michael.

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

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

Re: [Libreoffice-commits] Revert installer: Use hashref for replace_all_ziplistvariables_in_rtffile

2012-08-23 Thread Stephan Bergmann


On 08/23/2012 09:59 AM, Libreoffice Gerrit user wrote:

commit 52755d6d2cf1c6addaf3c91b93bb86d66b730409
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Aug 23 09:47:13 2012 +0200

 Revert installer: Use hashref for replace_all_ziplistvariables_in_rtffile

 This reverts commit 46a977081c6f1886f8fff8457c85e6d426dcc20f.  It started 
to
 replace occurrences of ${...} unknown to the installer with empty 
strings,
 instead of keeping them as-is.  This caused the ${ORIGIN} at the start 
of the
 value for URE_BOOTSTRAP to disappear from the soffice ini-file (cf.
 gid_Brand_Profileitem_Soffice_UreBootstrap in 
scp2/source/ooo/common_brand.scp),
 making soffice fail to start completely.

 Change-Id: Ia7a34179b78677a703fc487401e011073d14a176


Hi Tim, all,

Needed to revert, see above.  The original situation of how the 
installer Perl code (we have no good name to talk about it, btw) does 
string replacements was never really satisfactory to begin with, 
replacing just those ${abc} it happens to recognize (i.e., that are 
defined in instsetoo_native/util/openoffice.lst, IIUC) and leaving 
unknown ones (like ${ORIGIN}) alone.


A much more robust approach would be to specify an escape mechanism 
(either \$ to quote $ and \\ to quote \, or $$ to quote $, 
say) in the input language of the installer code.  But doing so would 
mean that all the existing input text needs to be reviewed, adding 
escapements exactly where necessary.


Stephan

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

[PUSHED] unusedcode.easy: remove recently unused code

From Andras Timar ati...@suse.com:

Andras Timar has submitted this change and it was merged.

Change subject: unusedcode.easy: remove recently unused code
..


unusedcode.easy: remove recently unused code

Change-Id: Ia33e933d9c15c2afa25915b7e8d6a13b0c740d1c
---
M unusedcode.easy
M vcl/inc/unx/salgdi.h
M vcl/inc/vcl/alpha.hxx
M vcl/source/gdi/alpha.cxx
M vcl/unx/generic/gdi/salgdi2.cxx
5 files changed, 0 insertions(+), 133 deletions(-)

Approvals:
  Andras Timar: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia33e933d9c15c2afa25915b7e8d6a13b0c740d1c
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Thomas Arnhold tho...@arnhold.org
Gerrit-Reviewer: Andras Timar ati...@suse.com
Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org

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

Re: 'make check' failure

2012-08-23 Thread Stephan Bergmann


On 08/23/2012 09:22 AM, John Smith wrote:

On Thu, Aug 23, 2012 at 9:14 AM, Stephan Bergmann sberg...@redhat.com wrote:


you should always run those tests with (bash etc.:) 'ulimit -c unlimited';
the gbuild logic will automatically print backtraces in case of a crash then
(if your system is set up to generate core files named core or
core.pid into cwd).

Stephan


I do have core set to unlimited, but I still got a message that a core
could not be generated, and all the output I got was what I posted
already.


Odd then.  Maybe your system's behavior doesn't match those if your 
system... requirements from above?


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

[Libreoffice-commits] .: sd/source

 sd/source/ui/remotecontrol/BufferedStreamSocket.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6737f12e0a4a10a591dcc780de586f205e094f2f
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Thu Aug 23 11:12:37 2012 +0300

Conversion from 'void*' to pointer to non-'void' requires an explicit cast

Change-Id: Ia7e0a436d462fc98b458f80f2abae409419c11c1

diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx 
b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
index 0733db4..d35b606 100644
--- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
+++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
@@ -52,7 +52,7 @@ sal_Int32 BufferedStreamSocket::write( const void* pBuffer, 
sal_uInt32 n )
 if ( !usingCSocket )
 return StreamSocket::write( pBuffer, n );
 else
-return ::send( mSocket, pBuffer, (size_t) n, 0 );
+return ::send( mSocket, (const char *) pBuffer, (size_t) n, 0 );
 }
 
 sal_Int32 BufferedStreamSocket::readLine( OString aLine )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] Revert installer: Use hashref for replace_all_ziplistvariables_in_rtffile


On Thu, 2012-08-23 at 10:13 +0200, Stephan Bergmann wrote:
 Needed to revert, see above.  The original situation of how the 
 installer Perl code (we have no good name to talk about it, btw) does 
 string replacements was never really satisfactory to begin with, 
 replacing just those ${abc} it happens to recognize (i.e., that are 
 defined in instsetoo_native/util/openoffice.lst, IIUC) and leaving 
 unknown ones (like ${ORIGIN}) alone.

Yep.

 A much more robust approach would be to specify an escape mechanism 
 (either \$ to quote $ and \\ to quote \, or $$ to quote $, 
 say) in the input language of the installer code.  But doing so would 
 mean that all the existing input text needs to be reviewed, adding 
 escapements exactly where necessary.

A good approach here of course is to do two installs, one un-modified
and one after the change; and then do a 'diff -u -r' on the installed
directories - ideally they are binary identical ;-)

It's a shame to loose Tim's nice unit test too - I love tests for
make_installer.pl :-) Might be nice as/when this is nailed to have some
gnumake guru to help connect them into the build.

When I last looked at some of this horrific line-by-line substitution
magic, it turned out to be faster to concatenate all the lines into a
single string, run the regexp and split it again rather than do the
line-by-line regexping that was there before ;- horrific but ... still
- there are lots of less-moronic ways of doing that replacement ;-)

It's great to have your ongoing cleanup work there ! pruning out great
chunks of un-readable, un-used, poorly performing cruft is cool.

Thanks,

Michael.

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

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

Re: [Libreoffice-commits] Revert installer: Use hashref for replace_all_ziplistvariables_in_rtffile

2012-08-23 Thread Noel Grandin



On 2012-08-23 10:43, Michael Meeks wrote:


When I last looked at some of this horrific line-by-line substitution
magic, it turned out to be faster to concatenate all the lines into a
single string, run the regexp and split it again rather than do the
line-by-line regexping that was there before ;- horrific but ... still
- there are lots of less-moronic ways of doing that replacement ;-)

Strange. Does perl not have a way to compile and cache regular expressions?


Disclaimer: http://www.peralex.com/disclaimer.html


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

Re: improving from address in gerrit emails to commits list?

2012-08-23 Thread Thorsten Behrens

Noel Grandin wrote:
 I got kind of used to seeing who did the commit in the from column
 of my email client, and I miss that :-)
 
Yes, me too - had to mangle my procmail stalk filters subsequently.
;)

-- Thorsten


pgpeoMlBM9fO7.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: android/Bootstrap android/experimental android/qa config_host.mk.in configure.in

 android/Bootstrap/Makefile.shared |   12 +++-
 android/experimental/DocumentLoader/Makefile  |   17 ++---
 android/experimental/LibreOffice4Android/Makefile |8 
 android/qa/desktop/Makefile   |8 
 android/qa/sc/Makefile|   12 ++--
 android/qa/simple/Makefile|   10 +-
 config_host.mk.in |1 +
 configure.in  |   11 ---
 8 files changed, 37 insertions(+), 42 deletions(-)

New commits:
commit c02e838ec21408cd5ba70e0e7b53309411d49db2
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Aug 23 12:26:52 2012 +0300

Factor out the Android APP_ABI sanely instead of copy-paste galore

Change-Id: I66e97d73c410ac6f2e481ba9b2b22183f57438bd

diff --git a/android/Bootstrap/Makefile.shared 
b/android/Bootstrap/Makefile.shared
index f18c187..2dd2023 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -11,14 +11,8 @@
 # code are very much self-contained pre-packaged thingies.
 APP_DATA_PATH=/data/data/$(APP_PACKAGE)
 
-# Adapt to both Intel and ARM architectures
-ifeq ($(CPU),I)
-ABI_PATH=x86
-else
-ABI_PATH=armeabi-v7a
-endif
-SODEST=libs/$(ABI_PATH)
-OBJLOCAL=obj/local/$(ABI_PATH)
+SODEST=libs/$(ANDROID_APP_ABI)
+OBJLOCAL=obj/local/$(ANDROID_APP_ABI)
 
 define COPYSO
 cp $(1) $(SODEST)$(if $(2),/$(2))  $(STRIP) --strip-debug $(SODEST)$(if 
$(2),/$(2),/$(notdir $(1)))  \
@@ -36,7 +30,7 @@ endef
 properties:
echo sdk.dir=$(ANDROID_SDK_HOME) local.properties
echo sdk.dir=$(ANDROID_SDK_HOME) ../../Bootstrap/local.properties
-   echo APP_ABI := $(ABI_PATH)  jni/Application.mk
+   echo APP_ABI := $(ANDROID_APP_ABI)  jni/Application.mk
echo APP_PLATFORM := android-14  jni/Application.mk
 
 install: build-ant
diff --git a/android/experimental/DocumentLoader/Makefile 
b/android/experimental/DocumentLoader/Makefile
index 917004a..804d915 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -16,13 +16,8 @@ APP_PACKAGE=org.libreoffice.android.examples
 # code are very much self-contained pre-packaged thingies.
 APP_DATA_PATH=/data/data/$(APP_PACKAGE)
 
-ifeq ($(CPU),I)
-ABI_PATH=x86
-else
-ABI_PATH=armeabi-v7a
-endif
-SODEST=libs/$(ABI_PATH)
-OBJLOCAL=obj/local/$(ABI_PATH)
+SODEST=libs/$(ANDROID_APP_ABI)
+OBJLOCAL=obj/local/$(ANDROID_APP_ABI)
 
 define COPYSO
 cp $(1) $(SODEST)$(if $(2),/$(2))  $(STRIP) --strip-debug $(SODEST)$(if 
$(2),/$(2),/$(notdir $(1)))  \
@@ -47,9 +42,9 @@ copy-stuff:
mkdir -p $(SODEST) $(OBJLOCAL)
 #
 # Copy shared libraries (including UNO components) we need to
-# libs/armeabi-v7a so that ant will include them in the .apk.
+# libs/$(ANDROID_APP_ABI) so that ant will include them in the .apk.
 #
-# Copy them to obj/local/armeabi-v7a, too, where gdb will look for
+# Copy them to obj/local/$(ANDROID_APP_ABI), too, where gdb will look for
 # them.
 #
for F in $(strip \
@@ -135,7 +130,7 @@ copy-stuff:
done
 #
 # Then the shared GNU C++ library
-   $(call 
COPYSO,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/$(ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR)libs/$(ABI_PATH)/libgnustl_shared.so)
+   $(call 
COPYSO,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/$(ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR)libs/$(ANDROID_APP_ABI)/libgnustl_shared.so)
 #
 # Then other assets. Let the directory structure under assets mimic
 # that under solver for now.
@@ -235,7 +230,7 @@ copy-stuff:
 # Then gdbserver and gdb.setup so that we can debug with ndk-gdb.
 #
cp $(ANDROID_NDK_GDBSERVER) $(SODEST)
-   echo set solib-search-path ./obj/local/$(ABI_PATH) $(SODEST)/gdb.setup
+   echo set solib-search-path ./obj/local/$(ANDROID_APP_ABI) 
$(SODEST)/gdb.setup
 
 build-ant: copy-stuff properties
 #
diff --git a/android/experimental/LibreOffice4Android/Makefile 
b/android/experimental/LibreOffice4Android/Makefile
index bb2c02e..837f930 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -14,9 +14,9 @@ copy-stuff:
mkdir -p $(SODEST) $(OBJLOCAL)
 #
 # Copy shared libraries (including UNO components) we need to
-# libs/armeabi-v7a so that ant will include them in the .apk.
+# libs/$(ANDROID_APP_ABI) so that ant will include them in the .apk.
 #
-# Copy them to obj/local/armeabi-v7a, too, where gdb will look for
+# Copy them to obj/local/$(ANDROID_APP_ABI), too, where gdb will look for
 # them.
 #
for F in $(strip \
@@ -114,7 +114,7 @@ copy-stuff:
done
 #
 # Then the shared GNU C++ library
-   $(call 
COPYSO,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/$(ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR)libs/$(ABI_PATH)/libgnustl_shared.so)
+   $(call

[Libreoffice-commits] .: sd/source

 sd/source/ui/remotecontrol/BluetoothServer.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 0d68487f10de1783974a41592526e6df55cf97e9
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Thu Aug 23 11:41:36 2012 +0200

Disable bluetooth on Linux for glib  2.26.

Change-Id: If5fae4166b2f935f5d7613799370dd0de28b498c

diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx 
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 556bc59..a2de11c 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -10,6 +10,7 @@
 #include stdio.h
 
 #ifdef LINUX
+#include glib.h
 #include gio/gio.h
 #include sys/unistd.h
 #include sys/socket.h
@@ -53,6 +54,7 @@ struct oslSocketImpl {
 void BluetoothServer::execute()
 {
 #ifdef LINUX
+#ifdef GLIB_VERSION_2_26
 g_type_init();
 GError* aError = NULL;
 GDBusConnection* aConnection = g_bus_get_sync( G_BUS_TYPE_SYSTEM, NULL, 
aError );
@@ -191,7 +193,8 @@ void BluetoothServer::execute()
 
 }
 
-#endif
+#endif // GLIB_VERSION_2_26
+#endif // LINUX
 
 #ifdef WIN32
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: 'make check' failure

On 23/08/12 10:19, Stephan Bergmann wrote:
 On 08/23/2012 09:22 AM, John Smith wrote:
 On Thu, Aug 23, 2012 at 9:14 AM, Stephan Bergmann sberg...@redhat.com 
 wrote:

 you should always run those tests with (bash etc.:) 'ulimit -c unlimited';
 the gbuild logic will automatically print backtraces in case of a crash then
 (if your system is set up to generate core files named core or
 core.pid into cwd).

 Stephan

 I do have core set to unlimited, but I still got a message that a core
 could not be generated, and all the output I got was what I posted
 already.
 
 Odd then.  Maybe your system's behavior doesn't match those if your 
 system... requirements from above?

reading the log you posted no you don't get a core file because
soffice.bin didn't actually crash.

the test framework that runs unoapi tests will happily continue running
more tests until the end if one simply fails to give the expected results.

i think i've seen a failure in some ScAccessibleFoo as well a week or
two ago on Linux, but couldn't reproduce it.

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

[Libreoffice-commits] .: android/experimental android/qa

 android/experimental/DocumentLoader/Makefile   |3 +++
 android/experimental/DocumentLoader/jni/Application.mk |3 ---
 android/qa/sc/Makefile |3 +++
 android/qa/sc/jni/Application.mk   |2 --
 4 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 811751bbadbf2cc6f77fc1a7f311fec9edc7d937
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Aug 23 12:33:37 2012 +0300

Don't hardcode jni/Application.mk either

Change-Id: Id8787a04a3b1720490e7d79a254ca11835df242a

diff --git a/android/experimental/DocumentLoader/Makefile 
b/android/experimental/DocumentLoader/Makefile
index 804d915..adff84f 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -35,6 +35,9 @@ all: build-ant
 properties:
echo sdk.dir=$(ANDROID_SDK_HOME) local.properties
echo sdk.dir=$(ANDROID_SDK_HOME) ../../Bootstrap/local.properties
+   echo # File needed by ndk-gdb jni/Application.mk
+   echo APP_ABI := $(ANDROID_APP_ABI) jni/Application.mk
+   echo APP_PLATFORM := android-14 jni/Application.mk
 
 copy-stuff:
 # First always clean
diff --git a/android/experimental/DocumentLoader/jni/Application.mk 
b/android/experimental/DocumentLoader/jni/Application.mk
deleted file mode 100644
index f326d1a..000
--- a/android/experimental/DocumentLoader/jni/Application.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# File needed by ndk-gdb
-APP_ABI := armeabi-v7a
-APP_PLATFORM := android-14
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 91f4c48..b77c5cf 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -26,6 +26,9 @@ all: build-ant
 properties:
echo sdk.dir=$(ANDROID_SDK_HOME) local.properties
echo sdk.dir=$(ANDROID_SDK_HOME) ../../Bootstrap/local.properties 
+   echo # File needed by ndk-gdb jni/Application.mk
+   echo APP_ABI := $(ANDROID_APP_ABI) jni/Application.mk
+   echo APP_PLATFORM := android-14 jni/Application.mk
 
 copy-stuff:
 #
diff --git a/android/qa/sc/jni/Application.mk b/android/qa/sc/jni/Application.mk
deleted file mode 100644
index a11b28d..000
--- a/android/qa/sc/jni/Application.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-APP_ABI := armeabi-v7a
-APP_PLATFORM := android-14
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] Revert installer: Use hashref for replace_all_ziplistvariables_in_rtffile


On Thu, 2012-08-23 at 11:03 +0200, Noel Grandin wrote:
 On 2012-08-23 10:43, Michael Meeks wrote:
  When I last looked at some of this horrific line-by-line substitution
  magic, it turned out to be faster to concatenate all the lines into a
  single string, run the regexp and split it again rather than do the
  line-by-line regexping that was there before ;- horrific but ... still
  - there are lots of less-moronic ways of doing that replacement ;-)

 Strange. Does perl not have a way to compile and cache regular expressions?

Sure - I tried that in this instance; it just turned out that running a
regexp over one really big string, was faster than running a compiled
regex:

$ wc -l solver/unxlngi6.pro/bin/setup_osl.ins 
103700 solver/unxlngi6.pro/bin/setup_osl.ins

around that many times ;-)

ATB,

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] .: configure.in

 configure.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit afeab46e4754d886dd828ba654520902a755964f
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Aug 23 12:49:52 2012 +0300

Typo, fdo#53950

Change-Id: I82b4b59e868bb4f332cfe0e617c916a160cb549a

diff --git a/configure.in b/configure.in
index 94c8243..3f22631 100644
--- a/configure.in
+++ b/configure.in
@@ -2653,8 +2653,8 @@ if test $_os = Darwin; then
 /Developer/*)
 gccprefix=
 ;;
-/Developer.old/*)
-gccprefix=/Developer.old/usr/bin/
+/Developer-old/*)
+gccprefix=/Developer-old/usr/bin/
 ;;
 /Xcode3/*)
 gccprefix=/Xcode3/usr/bin/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - oox/source sc/inc sc/Library_scfilt.mk sc/source

 oox/source/token/tokens.txt  |2 
 sc/Library_scfilt.mk |1 
 sc/inc/colorscale.hxx|5 
 sc/source/filter/excel/excdoc.cxx|8 -
 sc/source/filter/excel/xecontent.cxx |   34 
 sc/source/filter/excel/xeextlst.cxx  |  246 +++
 sc/source/filter/excel/xetable.cxx   |6 
 sc/source/filter/inc/xecontent.hxx   |7 
 sc/source/filter/inc/xeextlst.hxx|  139 +++
 sc/source/filter/inc/xetable.hxx |3 
 sc/source/filter/inc/xlcontent.hxx   |1 
 sc/source/filter/xml/xmlstyli.cxx|4 
 12 files changed, 443 insertions(+), 13 deletions(-)

New commits:
commit 333f9d3016bf9a246dfa96bc32c064281f36f355
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Wed Aug 22 23:15:34 2012 +0200

sal_True - true

Change-Id: I7d8c637746d8f29704adf94b20559d539d0ec56c

diff --git a/sc/source/filter/xml/xmlstyli.cxx 
b/sc/source/filter/xml/xmlstyli.cxx
index 9bf6de7..1ef7cda 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -516,7 +516,7 @@ void XMLTableStyleContext::FillPropertySet(
 if (!bParentSet)
 {
 AddProperty(CTF_SC_CELLSTYLE, 
uno::makeAny(GetImport().GetStyleDisplayName( XML_STYLE_FAMILY_TABLE_CELL, 
GetParentName() )));
-bParentSet = sal_True;
+bParentSet = true;
 }
 sal_Int32 nNumFmt = GetNumberFormat();
 if (nNumFmt = 0)
@@ -534,7 +534,7 @@ void XMLTableStyleContext::FillPropertySet(
 ++aItr;
 }
 AddProperty(CTF_SC_IMPORT_MAP, aConditionalFormat);
-bConditionalFormatCreated = sal_True;
+bConditionalFormatCreated = true;
 }
 }
 else if (GetFamily() == XML_STYLE_FAMILY_TABLE_TABLE)
commit c346c0cfc981d18e1d5024e3abbe124fbbf4a607
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Wed Aug 22 23:05:56 2012 +0200

support export of databar information to extlst for excel2010

Change-Id: I1aaca6676bdbba1e8f365081e3f427fb67fd873e

diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt
index fee78ee..64979d5 100644
--- a/oox/source/token/tokens.txt
+++ b/oox/source/token/tokens.txt
@@ -5661,6 +5661,7 @@ wrapcoords
 writeProtection
 wsDr
 x
+x14
 xAlign
 xIllusions
 xMode
@@ -5676,6 +5677,7 @@ xfrmType
 xl2000
 xl97
 xlm
+xm
 xml
 xmlBased
 xmlCellPr
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 2c83049..870f28c 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -82,6 +82,7 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\
sc/source/filter/excel/xechart \
sc/source/filter/excel/xecontent \
sc/source/filter/excel/xeescher \
+   sc/source/filter/excel/xeextlst \
sc/source/filter/excel/xeformula \
sc/source/filter/excel/xehelper \
sc/source/filter/excel/xelink \
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 942f604..db13e92 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -26,6 +26,9 @@
  * instead of those above.
  */
 
+#ifndef SC_COLORSCALE_HXX
+#define SC_COLORSCALE_HXX
+
 #include boost/ptr_container/ptr_vector.hpp
 #include boost/scoped_ptr.hpp
 #include formula/grammar.hxx
@@ -258,4 +261,6 @@ private:
 boost::scoped_ptrScDataBarFormatData mpFormatData;
 };
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/excel/excdoc.cxx 
b/sc/source/filter/excel/excdoc.cxx
index e83c119..b25e4dc 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -64,6 +64,7 @@
 
 #include excdoc.hxx
 #include namebuff.hxx
+#include xeextlst.hxx
 
 #include xcl97rec.hxx
 #include xcl97esc.hxx
@@ -524,7 +525,7 @@ void ExcTable::FillAsTable( SCTAB nCodeNameIdx )
 Add( new XclExpWebQueryBuffer( GetRoot() ) );
 
 // conditional formats
-Add( new XclExpCondFormatBuffer( GetRoot() ) );
+Add( new XclExpCondFormatBuffer( GetRoot(), XclExtLstRef() ) );
 
 if( HasVbaStorage() )
 if( nCodeNameIdx  GetExtDocOptions().GetCodeNameCount() )
@@ -555,6 +556,7 @@ void ExcTable::FillAsXmlTable( SCTAB nCodeNameIdx )
 
 // WSBOOL needs data from page settings, create it here, add it later
 boost::shared_ptr XclExpPageSettings  xPageSett( new XclExpPageSettings( 
GetRoot() ) );
+XclExtLstRef xExtLst( new XclExtLst( GetRoot() ) );
 bool bFitToPages = xPageSett-GetPageData().mbFitToPages;
 
 Add( new ExcBof8 );
@@ -601,7 +603,7 @@ void ExcTable::FillAsXmlTable( SCTAB nCodeNameIdx )
 aRecList.AppendRecord( mxCellTable-CreateRecord( EXC_ID_MERGEDCELLS ) );
 
 // conditional formats
-Add( new XclExpCondFormatBuffer( GetRoot() ) );
+Add( new XclExpCondFormatBuffer( GetRoot(), xExtLst ) );
 
 if( HasVbaStorage() )
 if( nCodeNameIdx

Re: improving from address in gerrit emails to commits list?

2012-08-23 Thread Miklos Vajna

On Thu, Aug 23, 2012 at 09:52:53AM +0200, Noel Grandin n...@peralex.com wrote:
 Is it possible to munge the From: address in the gerrit emails
 that go to the commit list?
 
 I got kind of used to seeing who did the commit in the from column
 of my email client, and I miss that :-)

The script to hack is:

/git/libreoffice/core.git/hooks/update at people.freedesktop.org, I'm
attaching a trivial diff that could fix the issue (it sets the committer
of the last commit as From, hopefully that's good enough). Michael,
could you please apply it?

Thanks,

Miklos
--- update.orig	2012-08-23 12:18:20.218346617 +0200
+++ update	2012-08-23 12:21:16.997136580 +0200
@@ -72,6 +72,9 @@
 	subject=$repo: $subject
 fi
 
+# Set from
+from=$(git show -s --pretty=format:%cn %ce $1)
+
 if expr $2 : '0*$' /dev/null
 then
 	# new ref
@@ -134,6 +137,6 @@
 			fi
 		done
 fi |
-mail -s $subject -a X-Git-Repository: git://anongit.freedesktop.org/git/ooo-build/ooo-build \
+mail -s $subject -r $from -a X-Git-Repository: git://anongit.freedesktop.org/git/ooo-build/ooo-build \
  -a List-Post: mailto:libreoffice@lists.freedesktop.org $recipients
 exit 0
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - vcl/inc vcl/qa vcl/source

 vcl/inc/vcl/button.hxx |1 
 vcl/inc/vcl/dialog.hxx |1 
 vcl/inc/vcl/layout.hxx |   29 -
 vcl/qa/cppunit/builder/demo.ui |  114 +++
 vcl/source/control/button.cxx  |5 +
 vcl/source/window/builder.cxx  |2 
 vcl/source/window/dialog.cxx   |   59 +-
 vcl/source/window/layout.cxx   |  131 -
 8 files changed, 310 insertions(+), 32 deletions(-)

New commits:
commit 9ccf0191fed208acfd43b49638ab11138db104c8
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 23 11:54:40 2012 +0100

Implement a VclExpander equivalent of GtkExpander

Change-Id: I539d8d313a35509cf603f18e5f074eab331f2480

diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx
index 6edfe7e..5a73e0a 100644
--- a/vcl/inc/vcl/button.hxx
+++ b/vcl/inc/vcl/button.hxx
@@ -560,6 +560,7 @@ class VCL_DLLPUBLIC DisclosureButton : public CheckBox
 protected:
 SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState();
 public:
+DisclosureButton( Window* pParent, WinBits nStyle = 0 );
 DisclosureButton( Window* pParent, const ResId rResId );
 
 virtual voidKeyInput( const KeyEvent rKEvt );
diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx
index 8b6dc0f..5f24ee8 100644
--- a/vcl/inc/vcl/dialog.hxx
+++ b/vcl/inc/vcl/dialog.hxx
@@ -101,6 +101,7 @@ public:
 virtual SizeGetOptimalSize(WindowSizeType eType) const;
 virtual voidResize();
 boolisLayoutEnabled() const;
+voidsetInitialLayoutSize();
 virtual bool set_property(const rtl::OString rKey, const rtl::OString 
rValue);
 
 void set_border_width(int nBorderWidth)
diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx
index ca6d50f..42071ce 100644
--- a/vcl/inc/vcl/layout.hxx
+++ b/vcl/inc/vcl/layout.hxx
@@ -29,6 +29,7 @@
 #define _VCLLAYOUT_HXX
 
 #include vcl/dllapi.h
+#include vcl/button.hxx
 #include vcl/window.hxx
 #include boost/multi_array.hpp
 
@@ -377,8 +378,8 @@ class VCL_DLLPUBLIC VclBin : public VclContainer
 {
 public:
 VclBin(Window *pParent) : VclContainer(pParent) {}
-Window *get_child();
-const Window *get_child() const;
+virtual Window *get_child();
+virtual const Window *get_child() const;
 virtual Size calculateRequisition() const;
 virtual void setAllocation(const Size rAllocation);
 };
@@ -422,6 +423,30 @@ private:
 float m_fYScale;
 };
 
+class VCL_DLLPUBLIC VclExpander : public VclBin
+{
+public:
+VclExpander(Window *pParent)
+: VclBin(pParent)
+, m_bResizeTopLevel(true)
+, m_aDisclosureButton(this)
+{
+m_aDisclosureButton.SetToggleHdl(LINK(this, VclExpander, ClickHdl));
+m_aDisclosureButton.Show();
+}
+virtual Window *get_child();
+virtual const Window *get_child() const;
+virtual bool set_property(const rtl::OString rKey, const rtl::OString 
rValue);
+protected:
+virtual Size calculateRequisition() const;
+virtual void setAllocation(const Size rAllocation);
+private:
+bool m_bResizeTopLevel;
+DisclosureButton m_aDisclosureButton;
+DECL_DLLPRIVATE_LINK(ClickHdl, DisclosureButton* pBtn);
+};
+
+
 /*
  * @return true if rValue is True, true, 1, etc.
  */
diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui
index 776173e..b83fd65 100644
--- a/vcl/qa/cppunit/builder/demo.ui
+++ b/vcl/qa/cppunit/builder/demo.ui
@@ -1880,6 +1880,120 @@
 property name=tab_fillFalse/property
   /packing
 /child
+child
+  object class=GtkExpander id=expander1
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=resize_toplevelTrue/property
+child
+  object class=GtkGrid id=grid5
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=row_spacing200/property
+property name=column_spacing400/property
+child
+  object class=GtkLabel id=label34
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label 
translatable=yeslabel/property
+  /object
+  packing
+property name=left_attach0/property
+property name=top_attach0/property
+property name=width1/property
+property name=height1/property
+  /packing
+/child
+child
+  object class=GtkLabel id=label35
+property name=visibleTrue/property
+property name=can_focusFalse/property
+

[Libreoffice-commits] .: sw/inc sw/source writerfilter/source

 sw/inc/IDocumentSettingAccess.hxx   |3 +-
 sw/inc/doc.hxx  |1 
 sw/source/core/doc/doc.cxx  |4 ++
 sw/source/core/doc/docnew.cxx   |1 
 sw/source/core/layout/frmtool.cxx   |   39 +++-
 sw/source/ui/uno/SwXDocumentSettings.cxx|   16 ++-
 writerfilter/source/filter/ImportFilter.cxx |2 +
 7 files changed, 63 insertions(+), 3 deletions(-)

New commits:
commit 50a1df360c907d8419ce49f098b6bc87a37a9956
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Aug 23 12:11:08 2012 +0200

n#775899 sw: add FloattableNomargins compat flag

The DOCX filter imports floating tables as frames containing a table.
Word ignores the margins of paragraphs next to such a table, Writer does
not. Add a compatibility flag the import filter can set that triggers
this weird behaviour.

Change-Id: Iaaa1d2a2e2f9d0eaea17832b2e418f9a845efffd

diff --git a/sw/inc/IDocumentSettingAccess.hxx 
b/sw/inc/IDocumentSettingAccess.hxx
index dd907f2..8263ca6 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -94,7 +94,8 @@ namespace com { namespace sun { namespace star { namespace 
i18n { struct Forbidd
  PURGE_OLE,
  KERN_ASIAN_PUNCTUATION,
  MATH_BASELINE_ALIGNMENT,
- STYLES_NODEFAULT
+ STYLES_NODEFAULT,
+ FLOATTABLE_NOMARGINS
  };
 
  public:
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index c18635e..2702d1c 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -567,6 +567,7 @@ private:
 // attribute 
'WrapInfluenceOnObjPos'.
 bool mbMathBaselineAlignment: 1;// TL  2010-10-29 #i972#
 bool mbStylesNoDefault  : 1;
+bool mbFloattableNomargins  : 1; /// If paragraph margins 
next to a floating table should be ignored.
 
 // non-ui-compatibility flags:
 bool mbOldNumbering : 1;
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 834bc96..45749b4 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -210,6 +210,7 @@ bool SwDoc::get(/*[in]*/ DocumentSettingId id) const
 case DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT: return 
mbDoNotResetParaAttrsForNumFont;
 case MATH_BASELINE_ALIGNMENT: return mbMathBaselineAlignment;
 case STYLES_NODEFAULT: return mbStylesNoDefault;
+case FLOATTABLE_NOMARGINS: return mbFloattableNomargins;
 default:
 OSL_FAIL(Invalid setting id);
 }
@@ -381,6 +382,9 @@ void SwDoc::set(/*[in]*/ DocumentSettingId id, /*[in]*/ 
bool value)
 case STYLES_NODEFAULT:
 mbStylesNoDefault  = value;
 break;
+case FLOATTABLE_NOMARGINS:
+mbFloattableNomargins = value;
+break;
 default:
 OSL_FAIL(Invalid setting id);
 }
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 878223c..1a89837 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -356,6 +356,7 @@ SwDoc::SwDoc()
 mbSmallCapsPercentage66 = false;// hidden
 mbTabOverflow   = true;
 mbUnbreakableNumberings = false;
+mbFloattableNomargins   = false;
 
 //
 // COMPATIBILITY FLAGS END
diff --git a/sw/source/core/layout/frmtool.cxx 
b/sw/source/core/layout/frmtool.cxx
index 4d2e231..1f190aa 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1928,6 +1928,26 @@ long SwBorderAttrs::CalcRight( const SwFrm* pCaller ) 
const
 return nRight;
 }
 
+/// Tries to detect if this paragraph has a floating table attached.
+bool lcl_hasTabFrm(const SwTxtFrm* pTxtFrm)
+{
+if (pTxtFrm-GetDrawObjs())
+{
+const SwSortedObjs* pSortedObjs = pTxtFrm-GetDrawObjs();
+if (pSortedObjs-Count()  0)
+{
+SwAnchoredObject* pObject = (*pSortedObjs)[0];
+if (pObject-IsA(TYPE(SwFlyFrm)))
+{
+SwFlyFrm* pFly = (SwFlyFrm*)pObject;
+if (pFly-Lower()-IsTabFrm())
+return true;
+}
+}
+}
+return false;
+}
+
 long SwBorderAttrs::CalcLeft( const SwFrm *pCaller ) const
 {
 long nLeft=0;
@@ -1945,7 +1965,24 @@ long SwBorderAttrs::CalcLeft( const SwFrm *pCaller ) 
const
 if ( pCaller-IsTxtFrm()  pCaller-IsRightToLeft() )
 nLeft += rLR.GetRight();
 else
-nLeft += rLR.GetLeft();
+{
+bool bIgnoreMargin = false;
+if (pCaller-IsTxtFrm())
+{
+const SwTxtFrm* pTxtFrm = (const SwTxtFrm*)pCaller;
+if 
(pTxtFrm-GetTxtNode()-GetDoc()-get(IDocumentSettingAccess::FLOATTABLE_NOMARGINS))
+{
+// If this is explicitly requested, ignore the

[Libreoffice-commits] .: sc/source

 sc/source/filter/excel/xeextlst.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c5d5e06c1578f8ecae9e4e6fb55f1bdb529feb7d
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Aug 23 13:04:45 2012 +0200

fix ambigous overload

diff --git a/sc/source/filter/excel/xeextlst.cxx 
b/sc/source/filter/excel/xeextlst.cxx
index f03b737..6155645 100644
--- a/sc/source/filter/excel/xeextlst.cxx
+++ b/sc/source/filter/excel/xeextlst.cxx
@@ -129,8 +129,8 @@ void XclExpExtDataBar::SaveXml( XclExpXmlStream rStrm )
 {
 sax_fastparser::FSHelperPtr rWorksheet = rStrm.GetCurrentStream();
 rWorksheet-startElementNS( XML_x14, XML_dataBar,
-XML_minLength, 
rtl::OString::valueOf(0).getStr(),
-XML_maxLength, 
rtl::OString::valueOf(100).getStr(),
+XML_minLength, 
rtl::OString::valueOf(static_castsal_Int32(0)).getStr(),
+XML_maxLength, 
rtl::OString::valueOf(static_castsal_Int32(100)).getStr(),
 XML_axisPosition, 
getAxisPosition(meAxisPosition),
 FSEND );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - 2 commits - vcl/source

 vcl/source/window/builder.cxx |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 00348dbd4f98095a32fb026a2bd8f5d1d17b8f8f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 23 12:21:28 2012 +0100

map GtkImage to FixedImage

Change-Id: Ia5c3ab0099fc68e90450beaf4c9f836f2e790767

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 5f01dc4..83ddfc8 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -450,6 +450,8 @@ Window *VclBuilder::makeObject(Window *pParent, const 
rtl::OString name, const
 }
 else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM(GtkLabel)))
 pWindow = new FixedText(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK);
+else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM(GtkImage)))
+pWindow = new FixedImage(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK);
 else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM(GtkEntry)))
 pWindow = new Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK);
 else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM(GtkNotebook)))
@@ -500,8 +502,6 @@ Window *VclBuilder::insertObject(Window *pParent, const 
rtl::OString rClass, co
 else
 {
 pCurrentChild = makeObject(pParent, rClass, rID, rMap);
-if (!pCurrentChild)
-fprintf(stderr, missing object!\n);
 }
 
 if (pCurrentChild)
@@ -517,10 +517,7 @@ Window *VclBuilder::insertObject(Window *pParent, const 
rtl::OString rClass, co
 rMap.clear();
 
 if (!pCurrentChild)
-{
-fprintf(stderr, missing object!\n);
 pCurrentChild = m_aChildren.empty() ? pParent : 
m_aChildren.back().m_pWindow;
-}
 return pCurrentChild;
 }
 
commit e1fa67aa096b5b5d82c8a1ac8dec6141a555e8b1
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 23 12:10:56 2012 +0100

recognize and silently handle placeholders

Change-Id: I6e825a1feff04bac3696c3e46a16d187cf048638

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 7b42362..5f01dc4 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -339,6 +339,8 @@ bool VclBuilder::extractModel(const rtl::OString id, 
stringmap rMap)
 
 Window *VclBuilder::makeObject(Window *pParent, const rtl::OString name, 
const rtl::OString id, stringmap rMap)
 {
+bool bIsPlaceHolder = name.isEmpty();
+
 if (pParent  pParent-GetType() == WINDOW_TABCONTROL)
 {
 //We have to add a page
@@ -352,8 +354,6 @@ Window *VclBuilder::makeObject(Window *pParent, const 
rtl::OString name, const
 pTabControl-InsertPage(nNewPageId, rtl::OUString());
 pTabControl-SetCurPageId(nNewPageId);
 
-bool bIsPlaceHolder = name.isEmpty();
-
 if (!bIsPlaceHolder)
 {
 TabPage* pPage = new TabPage(pTabControl);
@@ -369,6 +369,9 @@ Window *VclBuilder::makeObject(Window *pParent, const 
rtl::OString name, const
 }
 }
 
+if (bIsPlaceHolder)
+return NULL;
+
 Window *pWindow = NULL;
 if (name.equalsL(RTL_CONSTASCII_STRINGPARAM(GtkDialog)))
 pWindow = new Dialog(pParent, WB_SIZEMOVE|WB_3DLOOK|WB_CLOSEABLE);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - vcl/source

 vcl/source/window/builder.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit c2c4ce8d78286aa5691de57d9e75cbbe389c3590
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 23 12:29:26 2012 +0100

map GtkSeparator to FixedLine

Change-Id: I89b4663d94af7a57d915ea4386d5354a8d66190c

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 83ddfc8..ad792b9 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -452,6 +452,13 @@ Window *VclBuilder::makeObject(Window *pParent, const 
rtl::OString name, const
 pWindow = new FixedText(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK);
 else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM(GtkImage)))
 pWindow = new FixedImage(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK);
+else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM(GtkSeparator)))
+{
+if (extractOrientation(rMap))
+pWindow = new FixedLine(pParent, WB_VERT);
+else
+pWindow = new FixedLine(pParent, WB_HORZ);
+}
 else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM(GtkEntry)))
 pWindow = new Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK);
 else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM(GtkNotebook)))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - vcl/source

 vcl/source/window/builder.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 35c4c62c178f1ed2d08267c0845b7c05a2590f35
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 23 12:40:01 2012 +0100

map gtk-media-next and gtk-media-previous stock items

Change-Id: Id5c973942108a95649d1cc23b21820c2b981aef9

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index ad792b9..6f0c9af 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -257,6 +257,18 @@ namespace
 pWindow = new CancelButton(pParent, nBits);
 else if (sType.equalsL(RTL_CONSTASCII_STRINGPARAM(gtk-help)))
 pWindow = new HelpButton(pParent, nBits);
+else if 
(sType.equalsL(RTL_CONSTASCII_STRINGPARAM(gtk-media-next)))
+{
+PushButton *pBtn = new PushButton(pParent, nBits);
+pBtn-SetSymbol(SYMBOL_NEXT);
+pWindow = pBtn;
+}
+else if 
(sType.equalsL(RTL_CONSTASCII_STRINGPARAM(gtk-media-previous)))
+{
+PushButton *pBtn = new PushButton(pParent, nBits);
+pBtn-SetSymbol(SYMBOL_PREV);
+pWindow = pBtn;
+}
 else
 fprintf(stderr, unknown stock type %s\n, sType.getStr());
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED 3-6] Fix for fdo#53929 - Case insensitive strings in pivot table

2012-08-23 Thread Kohei Yoshida


Hi Michael,

On 08/23/2012 04:13 AM, Michael Meeks wrote:


set; surely it's smaller and easier to just do the pointer compare:

if (mpString == r.mpString)

is just as good presumably ?


Yes.  That's probably better and short-and-sweet since it avoids one 
equality comparison and still just as effective.  Good point.


except - with some more thinking:


Also, I wonder how often the data-pilot code will do this ?


A LOT.  String equality check was the single biggest performance 
bottleneck for years, with many documents thrown at me.  This change, 
along with the string interning, brought back pivot cache refresh time 
down from 23 seconds to 4 second with the test document I used at the time.


 presumably

if we build a hash-table of strings we know are not equal (I guess the
DP has bucketing code for this already), it'd be far faster to look both
strings up in that bucket, detect they are not the same and then
exit ;-) [ assuming the bucket is constructed case-insensitively ].


Well, the bucket is constructed case-sensitively for now.  I might try 
the case-insensitive hash table approach, which indeed sounds like a 
better idea, unless there are some gotchas lurking in there...


Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sw/qa sw/source writerfilter/Library_writerfilter.mk writerfilter/source

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |3 ---
 sw/qa/extras/rtfexport/rtfexport.cxx  |3 ---
 sw/source/filter/ww8/docxattributeoutput.cxx  |   11 +++
 sw/source/filter/ww8/rtfattributeoutput.cxx   |   18 +-
 writerfilter/Library_writerfilter.mk  |1 +
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |9 +++--
 writerfilter/source/rtftok/rtfdocumentimpl.cxx|9 +++--
 7 files changed, 31 insertions(+), 23 deletions(-)

New commits:
commit 2b5953a19e36a02040f2ff08bc87efe4785f80bd
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Thu Aug 23 14:06:45 2012 +0200

fix math export/import in docx/rtf

For some reason older gcc versions don't manage to dynamic_cast
to the necessary cast. I'm not quite sure why, forcing 
sal/osl/unx/module.cxx
to always use RTLD_GLOBAL does not seem to help. Most probably
compiler bug. Changing the cast to two simpler ones helps.

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 6615343..076eedc 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -49,10 +49,7 @@ public:
 CPPUNIT_TEST(testZoom);
 CPPUNIT_TEST(defaultTabStopNotInStyles);
 CPPUNIT_TEST(testFdo38244);
-// See rtfexport test on why this is blacklisted.
-#if !(__GNUC__ == 4  __GNUC_MINOR__ == 4)
 CPPUNIT_TEST(testMathEscape);
-#endif
 CPPUNIT_TEST(testFdo51034);
 #endif
 CPPUNIT_TEST_SUITE_END();
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index de705d2..67b6242 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -81,8 +81,6 @@ public:
 CPPUNIT_TEST(testFdo50831);
 CPPUNIT_TEST(testFdo48335);
 CPPUNIT_TEST(testFdo38244);
-// With gcc-4.4, the dynamic_cast in RtfAttributeOutput::FlyFrameOLEMath() 
fails, strange.
-#if !(__GNUC__ == 4  __GNUC_MINOR__ == 4)
 CPPUNIT_TEST(testMathAccents);
 CPPUNIT_TEST(testMathEqarray);
 CPPUNIT_TEST(testMathD);
@@ -100,7 +98,6 @@ public:
 CPPUNIT_TEST(testMathSubscripts);
 CPPUNIT_TEST(testMathVerticalstacks);
 CPPUNIT_TEST(testMathRuns);
-#endif
 CPPUNIT_TEST(testFdo53113);
 #endif
 CPPUNIT_TEST_SUITE_END();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 71c1915..b5165e7 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -87,6 +87,7 @@
 #include editeng/editobj.hxx
 #include svx/svdmodel.hxx
 #include svx/svdobj.hxx
+#include sfx2/sfxbasemodel.hxx
 
 #include anchoredobject.hxx
 #include docufld.hxx
@@ -2287,10 +2288,12 @@ void DocxAttributeOutput::WritePostponedMath()
 return;
 uno::Reference  embed::XEmbeddedObject  
xObj(const_castSwOLENode*(m_postponedMath)-GetOLEObj().GetOleRef());
 uno::Reference uno::XInterface  xInterface( xObj-getComponent(), 
uno::UNO_QUERY );
-if( oox::FormulaExportBase* formulaexport = dynamic_cast 
oox::FormulaExportBase* ( xInterface.get()))
-formulaexport-writeFormulaOoxml( m_pSerializer, 
GetExport().GetFilter().getVersion());
-else
-OSL_FAIL( Math OLE object cannot write out OOXML );
+// gcc4.4 (and 4.3 and possibly older) have a problem with dynamic_cast 
directly to the target class,
+// so help it with an intermediate cast. I'm not sure what exactly the problem 
is, seems to be unrelated
+// to RTLD_GLOBAL, so most probably a gcc bug.
+oox::FormulaExportBase* formulaexport = 
dynamic_castoox::FormulaExportBase*(dynamic_castSfxBaseModel*(xInterface.get()));
+assert( formulaexport != NULL );
+formulaexport-writeFormulaOoxml( m_pSerializer, 
GetExport().GetFilter().getVersion());
 m_postponedMath = NULL;
 }
 
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index a152e6e..15f15b7 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -80,6 +80,7 @@
 #include filter/msfilter/msoleexp.hxx
 #include filter/msfilter/rtfutil.hxx
 #include svtools/miscopt.hxx
+#include sfx2/sfxbasemodel.hxx
 
 #include docufld.hxx
 #include fmtclds.hxx
@@ -3362,15 +3363,14 @@ bool RtfAttributeOutput::FlyFrameOLEMath(const 
SwFlyFrmFmt* pFlyFrmFmt, SwOLENod
 
 m_aRunText-append({ LO_STRING_SVTOOLS_RTF_MMATH  );
 uno::Referenceutil::XCloseable xClosable(xObj-getComponent(), 
uno::UNO_QUERY);
-oox::FormulaExportBase* pBase = 
dynamic_castoox::FormulaExportBase*(xClosable.get());
-SAL_WARN_IF(!pBase, sw.rtf, Math OLE object cannot write out RTF);
-if (pBase)
-{
-OStringBuffer aBuf;
-pBase-writeFormulaRtf(aBuf, m_rExport.eCurrentEncoding);
-m_aRunText-append(aBuf.makeStringAndClear());
-}
-
+// gcc4.4 (and 4.3 and possibly older)

[Libreoffice-commits] .: 2 commits - writerperfect/source

 writerperfect/source/filter/DocumentHandler.cxx |   31 ++---
 writerperfect/source/filter/OdgGenerator.cxx|   35 ++--
 2 files changed, 37 insertions(+), 29 deletions(-)

New commits:
commit 7afb1fffefb1806205ddcef3cba1d2a559e9b39e
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Aug 23 14:13:49 2012 +0200

Iterate the utf8 correctly + handle tabs too

Change-Id: Ie6a4750ebd04e3b1ed8ad0985e141b6ff2e65e98

diff --git a/writerperfect/source/filter/OdgGenerator.cxx 
b/writerperfect/source/filter/OdgGenerator.cxx
index e8f365b..0d39862 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -1750,12 +1750,11 @@ void OdgGenerator::endTextSpan()
 
 void OdgGenerator::insertText(const WPXString text)
 {
-int length = text.len();
 WPXString out;
-for (int curr = 0; curr  length; ++curr)
+WPXString::Iter i(text);
+for (i.rewind(); i.next();)
 {
-char ch = text.cstr()[curr];
-if (ch == '\n')
+if ((*i()) == '\n' || (*i()) == '\t')
 {
 if (out.len() != 0)
 {
@@ -1763,12 +1762,20 @@ void OdgGenerator::insertText(const WPXString text)
 mpImpl-mBodyElements.push_back(pText);
 out.clear();
 }
-mpImpl-mBodyElements.push_back(new 
TagOpenElement(text:line-break));
-mpImpl-mBodyElements.push_back(new 
TagCloseElement(text:line-break));
+if ((*i()) == '\n')
+{
+mpImpl-mBodyElements.push_back(new 
TagOpenElement(text:line-break));
+mpImpl-mBodyElements.push_back(new 
TagCloseElement(text:line-break));
+}
+else if ((*i()) == '\t')
+{
+mpImpl-mBodyElements.push_back(new 
TagOpenElement(text:tab));
+mpImpl-mBodyElements.push_back(new 
TagCloseElement(text:tab));
+}
 }
 else
 {
-out.append(ch);
+out.append(i());
 }
 }
 if (out.len() != 0)
commit 8a274f73a28ee9d358059bfe9ce4395e3e284031
Author: Brennan Vincent brenn...@email.arizona.edu
Date:   Tue Aug 21 10:25:29 2012 -0700

Move writerperfect newline-handling logic to OdgGenerator::insertText

Change-Id: I6d954ac1233f98a379555043e8f82a1d2083

diff --git a/writerperfect/source/filter/DocumentHandler.cxx 
b/writerperfect/source/filter/DocumentHandler.cxx
index e1f58b2..8336c07 100644
--- a/writerperfect/source/filter/DocumentHandler.cxx
+++ b/writerperfect/source/filter/DocumentHandler.cxx
@@ -74,35 +74,12 @@ void DocumentHandler::endElement(const char *psName)
 
 void DocumentHandler::characters(const WPXString sCharacters)
 {
-int lastNewline = -1;
-int length = sCharacters.len();
-for (int curr = 0; curr  length; ++curr)
-{
-if (sCharacters.cstr()[curr] == '\n')
-{
-if (curr  lastNewline + 1)
-{
-OUString sCharU16(sCharacters.cstr() + lastNewline + 1, curr - 
lastNewline - 1, RTL_TEXTENCODING_UTF8);
-#ifdef DEBUG_XML
-WPXString sEscapedCharacters(sCharacters, true);
-printf(%s, sEscapedCharacters.cstr());
-#endif
-mxHandler-characters(sCharU16);
-}
-startElement(text:line-break, WPXPropertyList());
-endElement(text:line-break);
-lastNewline = curr;
-}
-}
-if (lastNewline + 1  length)
-{
-OUString sCharU16(sCharacters.cstr() + lastNewline + 1, length - 
lastNewline - 1, RTL_TEXTENCODING_UTF8);
+OUString sCharU16(sCharacters.cstr(), strlen(sCharacters.cstr()), 
RTL_TEXTENCODING_UTF8);
 #ifdef DEBUG_XML
-WPXString sEscapedCharacters(sCharacters, true);
-printf(%s, sEscapedCharacters.cstr());
+WPXString sEscapedCharacters(sCharacters, true);
+printf(%s, sEscapedCharacters.cstr());
 #endif
-mxHandler-characters(sCharU16);
-}
+mxHandler-characters(sCharU16);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/filter/OdgGenerator.cxx 
b/writerperfect/source/filter/OdgGenerator.cxx
index f873343..e8f365b 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -1750,8 +1750,32 @@ void OdgGenerator::endTextSpan()
 
 void OdgGenerator::insertText(const WPXString text)
 {
-DocumentElement *pText = new TextElement(text);
-mpImpl-mBodyElements.push_back(pText);
+int length = text.len();
+WPXString out;
+for (int curr = 0; curr  length; ++curr)
+{
+char ch = text.cstr()[curr];
+if (ch == '\n')
+{
+if (out.len() != 0)
+{
+DocumentElement *pText = new TextElement(out);
+mpImpl-mBodyElements.push_back(pText);
+out.clear();
+}
+

[Libreoffice-commits] .: 3 commits - solenv/bin sw/Library_swd.mk sw/source

 solenv/bin/modules/installer/simplepackage.pm|   19 +
 solenv/bin/modules/installer/systemactions.pm|   47 +++
 sw/Library_swd.mk|1 
 sw/source/ui/chrdlg/break.cxx|6 --
 sw/source/ui/chrdlg/chardlg.cxx  |6 --
 sw/source/ui/chrdlg/drpcps.cxx   |4 -
 sw/source/ui/chrdlg/numpara.cxx  |5 --
 sw/source/ui/chrdlg/pardlg.cxx   |4 -
 sw/source/ui/chrdlg/swuiccoll.cxx|5 --
 sw/source/ui/chrdlg/tblnumfm.cxx |5 --
 sw/source/ui/config/mailconfigpage.cxx   |5 --
 sw/source/ui/config/optcomp.cxx  |4 -
 sw/source/ui/config/optload.cxx  |4 -
 sw/source/ui/config/optpage.cxx  |4 -
 sw/source/ui/dbui/addresslistdialog.cxx  |3 -
 sw/source/ui/dbui/createaddresslistdialog.cxx|3 -
 sw/source/ui/dbui/customizeaddresslistdialog.cxx |4 -
 sw/source/ui/dbui/dbinsdlg.cxx   |4 -
 sw/source/ui/dbui/dbtablepreviewdialog.cxx   |6 --
 sw/source/ui/dbui/mailmergewizard.cxx|5 --
 sw/source/ui/dbui/mmaddressblockpage.cxx |3 -
 sw/source/ui/dbui/mmdocselectpage.cxx|5 --
 sw/source/ui/dbui/mmgreetingspage.cxx|4 -
 sw/source/ui/dbui/mmlayoutpage.cxx   |3 -
 sw/source/ui/dbui/mmmergepage.cxx|3 -
 sw/source/ui/dbui/mmoutputpage.cxx   |3 -
 sw/source/ui/dbui/mmoutputtypepage.cxx   |6 --
 sw/source/ui/dbui/mmpreparemergepage.cxx |4 -
 sw/source/ui/dbui/selectdbtabledialog.cxx|6 --
 sw/source/ui/dialog/abstract.cxx |6 --
 sw/source/ui/dialog/addrdlg.cxx  |5 --
 sw/source/ui/dialog/ascfldlg.cxx |3 -
 sw/source/ui/dialog/docstdlg.cxx |5 --
 sw/source/ui/dialog/macassgn.cxx |4 -
 sw/source/ui/dialog/swdialmgr.cxx|5 --
 sw/source/ui/dialog/swdlgfact.cxx|5 --
 sw/source/ui/dialog/swuiexp.cxx  |4 -
 sw/source/ui/dialog/uiregionsw.cxx   |4 -
 sw/source/ui/dialog/wordcountdialog.cxx  |3 -
 sw/source/ui/dochdl/selglos.cxx  |7 ---
 sw/source/ui/envelp/envfmt.cxx   |5 --
 sw/source/ui/envelp/envlop1.cxx  |4 -
 sw/source/ui/envelp/envprt.cxx   |6 --
 sw/source/ui/envelp/label1.cxx   |5 --
 sw/source/ui/envelp/labelexp.cxx |5 --
 sw/source/ui/envelp/labfmt.cxx   |5 --
 sw/source/ui/envelp/labprt.cxx   |6 --
 sw/source/ui/envelp/mailmrge.cxx |5 --
 sw/source/ui/fldui/DropDownFieldDialog.cxx   |5 --
 sw/source/ui/fldui/changedb.cxx  |6 --
 sw/source/ui/fldui/flddb.cxx |5 --
 sw/source/ui/fldui/flddinf.cxx   |5 --
 sw/source/ui/fldui/flddok.cxx|5 --
 sw/source/ui/fldui/fldedt.cxx|3 -
 sw/source/ui/fldui/fldfunc.cxx   |5 --
 sw/source/ui/fldui/fldpage.cxx   |6 --
 sw/source/ui/fldui/fldref.cxx|7 ---
 sw/source/ui/fldui/fldtdlg.cxx   |7 ---
 sw/source/ui/fldui/fldvar.cxx|5 --
 sw/source/ui/fldui/inpdlg.cxx|5 --
 sw/source/ui/fldui/javaedit.cxx  |5 --
 sw/source/ui/fmtui/tmpdlg.cxx|4 -
 sw/source/ui/frmdlg/column.cxx   |5 --
 sw/source/ui/frmdlg/cption.cxx   |6 --
 sw/source/ui/frmdlg/frmdlg.cxx   |5 --
 sw/source/ui/frmdlg/frmpage.cxx  |4 -
 sw/source/ui/frmdlg/pattern.cxx  |7 ---
 sw/source/ui/frmdlg/uiborder.cxx |5 --
 sw/source/ui/frmdlg/wrap.cxx |6 --
 sw/source/ui/index/cntex.cxx |7 ---
 sw/source/ui/index/cnttab.cxx|4 -
 sw/source/ui/index/multmrk.cxx   |7 ---
 sw/source/ui/index/swuiidxmrk.cxx|4 -
 sw/source/ui/misc/bookmark.cxx   |6 --
 sw/source/ui/misc/docfnote.cxx   |6 --
 sw/source/ui/misc/glosbib.cxx|4 -
 sw/source/ui/misc/glossary.cxx   |5 --
 sw/source/ui/misc/insfnote.cxx   |5 --
 sw/source/ui/misc/insrule.cxx|7 ---
 sw/source/ui/misc/linenum.cxx|6 --
 sw/source/ui/misc/num.cxx|4 -
 sw/source/ui/misc/outline.cxx|3 -
 sw/source/ui/misc/pgfnote.cxx|7 ---

[Libreoffice-commits] .: reportbuilder/java

 reportbuilder/java/com/sun/star/report/ImageService.java |
6 +-
 reportbuilder/java/com/sun/star/report/SOImageService.java   |   
21 +-
 reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java |   
20 -
 3 files changed, 24 insertions(+), 23 deletions(-)

New commits:
commit 86a60b36552d5785a33bc9eed1e082bd5c54100f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Aug 23 14:25:41 2012 +0200

fdo#38791: Do not use java.awt, causes problems on Mac OS X

On Mac OS X, it apparently suffices to execute new java.awt.Dimension() 
to run
into Apple AWT Java VM was loaded on first thread -- can't start AWT (see
http://developer.apple.com/library/mac/#technotes/tn2005/tn2147.html JNI
Development on Mac OS X - Thread-Safe JNI Programming - Calling AWT/Swing 
From
AppKit).

The solution here is simple, in that uses of java.awt.Dimension can be 
replaced
with com.sun.star.awt.Size without loss of functionality.  However, there 
are
still occurrences of java.awt.Image and java.awt.Toolkit lurking
(reportbuilder/java/com/sun/star/report/SOImageService.java,
reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java,

reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java)
for which it might be sheer luck that they do not seem to cause trouble yet.

Change-Id: I33e9f74c50ebddc11bd1d9a48c55dc8f8700345d

diff --git a/reportbuilder/java/com/sun/star/report/ImageService.java 
b/reportbuilder/java/com/sun/star/report/ImageService.java
index 4c106f9..31c05e1 100644
--- a/reportbuilder/java/com/sun/star/report/ImageService.java
+++ b/reportbuilder/java/com/sun/star/report/ImageService.java
@@ -17,7 +17,7 @@
  */
 package com.sun.star.report;
 
-import java.awt.Dimension;
+import com.sun.star.awt.Size;
 
 import java.io.InputStream;
 
@@ -48,7 +48,7 @@ public interface ImageService
  *
  * @throws ReportExecutionException
  * @return*/
-Dimension getImageSize(final InputStream image) throws 
ReportExecutionException;
+Size getImageSize(final InputStream image) throws ReportExecutionException;
 
 /**
  * @param image
@@ -56,6 +56,6 @@ public interface ImageService
  *
  * @throws ReportExecutionException
  * @return*/
-Dimension getImageSize(final byte[] image) throws ReportExecutionException;
+Size getImageSize(final byte[] image) throws ReportExecutionException;
 }
 
diff --git a/reportbuilder/java/com/sun/star/report/SOImageService.java 
b/reportbuilder/java/com/sun/star/report/SOImageService.java
index 81d3b10..e9c0739 100644
--- a/reportbuilder/java/com/sun/star/report/SOImageService.java
+++ b/reportbuilder/java/com/sun/star/report/SOImageService.java
@@ -32,8 +32,6 @@ import 
com.sun.star.lib.uno.adapter.InputStreamToXInputStreamAdapter;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;
 
-import java.awt.Dimension;
-
 import java.io.InputStream;
 
 
@@ -69,14 +67,14 @@ public class SOImageService implements ImageService
 }
 }
 
-public Dimension getImageSize(final InputStream image) throws 
ReportExecutionException
+public Size getImageSize(final InputStream image) throws 
ReportExecutionException
 {
 return getImageSize(new InputStreamToXInputStreamAdapter(image));
 }
 
-private Dimension getImageSize(final XInputStream image) throws 
ReportExecutionException
+private Size getImageSize(final XInputStream image) throws 
ReportExecutionException
 {
-final Dimension dim = new Dimension();
+final Size dim = new Size();
 try
 {
 final PropertyValue[] value = new PropertyValue[]
@@ -96,13 +94,15 @@ public class SOImageService implements ImageService
 if (xInfo.hasPropertyByName(Size100thMM))
 {
 Size imageSize = (Size) 
xImage.getPropertyValue(Size100thMM);
-dim.setSize(imageSize.Width, imageSize.Height);
-if (dim.height == 0  dim.width == 0)
+dim.Width = imageSize.Width;
+dim.Height = imageSize.Height;
+if (dim.Height == 0  dim.Width == 0)
 {
 imageSize = (Size) 
xImage.getPropertyValue(SizePixel);
 final int dpi = 
java.awt.Toolkit.getDefaultToolkit().getScreenResolution();
 final double fac = 2540 / (double) dpi;
-dim.setSize(imageSize.Width * fac, imageSize.Height * 
fac);
+dim.Width = (int) (imageSize.Width * fac);
+dim.Height = (int) (imageSize.Height * fac);
 }
 }
 else if (xInfo.hasPropertyByName(SizePixel))
@@ -110,7 +110,8 @@ public class SOImageService implements ImageService
 final

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - extensions/source

 extensions/source/propctrlr/formcomponenthandler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 95cedcc822ec1faa88f74771e3d435da926850d4
Author: Joel Madero jmadero@gmail.com
Date:   Tue Aug 21 12:14:34 2012 -0700

fdo#53001 disable unlink graphics in image control dialog in base report 
builder

Embedding graphics in a report builder report is not implemented,
so do not propose it to the user.
It already was not proposed the dialog raised by
Insert-Picture-From File
This commit disables embedding the UI when selecting
an image for an already existing Graphic control
(as opposed to inserting a new graphic control).

Change-Id: I107bc59bef8bb29a75140542cc5c2779a37ed113
Signed-off-by: Lionel Elie Mamane lio...@mamane.lu

diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx 
b/extensions/source/propctrlr/formcomponenthandler.cxx
index 4d13636..82baa8c 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2788,7 +2788,7 @@ namespace pcr
 // non-linked images ( e.g. those located in the document
 // stream ) only if document is available
 Reference XModel  xModel( impl_getContextDocument_nothrow() );
-bool bHandleNonLink = xModel.is();
+bool bHandleNonLink = false;
 
 Reference XFilePickerControlAccess  
xController(aFileDlg.GetFilePicker(), UNO_QUERY);
 DBG_ASSERT(xController.is(), 
FormComponentPropertyHandler::impl_browseForImage_nothrow: missing the 
controller interface on the file picker!);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED:master 3-6] [PATCH] fdo#53001:REPORT BUILDER UI: Unlink picture action in Image control file dialog without effect

2012-08-23 Thread Lionel Elie Mamane

On Tue, Aug 21, 2012 at 01:44:54PM -0700, Joel Madero wrote:
 As always, feel free to comment. Incredibly simple fix but took forever to
 locate the code. Many thanks to everyone who helped locate it.

Pushed to master and libreoffice-3-6.

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

[Libreoffice-commits] .: extensions/source

 extensions/source/propctrlr/formcomponenthandler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e4b0ce8887a743d30a0107bc7b8f652b0e3b074c
Author: Joel Madero jmadero@gmail.com
Date:   Tue Aug 21 12:14:34 2012 -0700

fdo#53001 disable unlink graphics in image control dialog in base report 
builder

Embedding graphics in a report builder report is not implemented,
so do not propose it to the user.
It already was not proposed the dialog raised by
Insert-Picture-From File
This commit disables embedding the UI when selecting
an image for an already existing Graphic control
(as opposed to inserting a new graphic control).

Change-Id: I107bc59bef8bb29a75140542cc5c2779a37ed113
Signed-off-by: Lionel Elie Mamane lio...@mamane.lu

diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx 
b/extensions/source/propctrlr/formcomponenthandler.cxx
index f757ca7..813bd93 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2786,7 +2786,7 @@ namespace pcr
 // non-linked images ( e.g. those located in the document
 // stream ) only if document is available
 Reference XModel  xModel( impl_getContextDocument_nothrow() );
-bool bHandleNonLink = xModel.is();
+bool bHandleNonLink = false;
 
 Reference XFilePickerControlAccess  
xController(aFileDlg.GetFilePicker(), UNO_QUERY);
 DBG_ASSERT(xController.is(), 
FormComponentPropertyHandler::impl_browseForImage_nothrow: missing the 
controller interface on the file picker!);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: android/sdremote

 android/sdremote/AndroidManifest.xml   
|4 
 android/sdremote/res/layout/dialog_addserver.xml   
|   46 ++
 android/sdremote/res/menu/selector_activity.xml
|6 
 android/sdremote/res/values/strings.xml
|6 
 android/sdremote/res/values/styles.xml 
|3 
 android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java   
|   75 ++
 
android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
 |   52 ++
 7 files changed, 191 insertions(+), 1 deletion(-)

New commits:
commit e29c020ee25fb820f4ae49c5f8d1e3df38aa76da
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Thu Aug 23 15:06:22 2012 +0200

Manual IP adding implemented.

Change-Id: Ifad2a206e3ddbb46094be6638581358484522695

diff --git a/android/sdremote/AndroidManifest.xml 
b/android/sdremote/AndroidManifest.xml
index b21ce6a..6572366 100644
--- a/android/sdremote/AndroidManifest.xml
+++ b/android/sdremote/AndroidManifest.xml
@@ -15,7 +15,9 @@
 application
 android:label=@string/app_name
 android:theme=@style/Theme.ImpressRemote 
-activity android:name=.SelectorActivity 
+activity
+android:name=.SelectorActivity
+android:uiOptions=splitActionBarWhenNarrow 
 intent-filter
 action android:name=android.intent.action.MAIN /
 
diff --git a/android/sdremote/res/layout/dialog_addserver.xml 
b/android/sdremote/res/layout/dialog_addserver.xml
new file mode 100644
index 000..01ddba2
--- /dev/null
+++ b/android/sdremote/res/layout/dialog_addserver.xml
@@ -0,0 +1,46 @@
+?xml version=1.0 encoding=utf-8?
+LinearLayout xmlns:android=http://schemas.android.com/apk/res/android;
+android:id=@+id/addserver_root
+android:layout_width=match_parent
+android:layout_height=match_parent
+android:orientation=vertical 
+
+TextView
+android:id=@+id/addserver_namelabel
+android:layout_width=wrap_content
+android:layout_height=wrap_content
+android:text=@string/addserver_entername /
+
+EditText
+android:id=@+id/addserver_nameentry
+android:layout_width=match_parent
+android:layout_height=wrap_content
+android:ems=10
+android:inputType=textCapWords 
+
+requestFocus /
+/EditText
+
+TextView
+android:id=@+id/addserver_addressabel
+android:layout_width=wrap_content
+android:layout_height=wrap_content
+android:text=@string/addserver_enteraddress /
+
+EditText
+android:id=@+id/addserver_addressentry
+android:layout_width=match_parent
+android:layout_height=wrap_content
+android:ems=10
+android:inputType=textUri 
+
+/EditText
+
+CheckBox
+android:id=@+id/addserver_remember
+android:layout_width=wrap_content
+android:layout_height=wrap_content
+android:checked=true
+android:text=@string/addserver_remember /
+
+/LinearLayout
\ No newline at end of file
diff --git a/android/sdremote/res/menu/selector_activity.xml 
b/android/sdremote/res/menu/selector_activity.xml
new file mode 100644
index 000..dab6e20
--- /dev/null
+++ b/android/sdremote/res/menu/selector_activity.xml
@@ -0,0 +1,6 @@
+?xml version=1.0 encoding=utf-8?
+menu xmlns:android=http://schemas.android.com/apk/res/android; 
+item android:id=@+id/menu_selector_addServer 
android:title=@string/addserver android:showAsAction=always/item
+
+
+/menu
\ No newline at end of file
diff --git a/android/sdremote/res/values/strings.xml 
b/android/sdremote/res/values/strings.xml
index 6ede30d..fb1ac80 100644
--- a/android/sdremote/res/values/strings.xml
+++ b/android/sdremote/res/values/strings.xml
@@ -32,5 +32,11 @@
 string name=about_closeClose/string
 string name=about_versionstringVersion: {0} (Build ID: {1})/string
 string name=about_copyrightCopyright \u00A9 2012 LibreOffice 
Contributors and/or their affiliates./string
+string name=addserverAdd Server/string
+string name=addserver_enternameServer name:/string
+string name=addserver_enteraddressServer address as IP or 
hostname:/string
+string name=addserver_rememberRemember this server next time/string
+string name=addserver_addAdd/string
+string name=addserver_cancelCancel/string
 
 /resources
\ No newline at end of file
diff --git a/android/sdremote/res/values/styles.xml 
b/android/sdremote/res/values/styles.xml
index de47193..73d2209 100644
--- a/android/sdremote/res/values/styles.xml
+++ b/android/sdremote/res/values/styles.xml
@@ -24,6 +24,8 @@
 item name=background@color/orange/item
 item 
name=android:titleTextStyle@style/Theme.ImpressRemote.ActionBar.Title/item

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source

 sw/source/ui/index/cnttab.cxx |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 3f88a4b00c6140c4294583cbaf75954486f5f5b6
Author: Michael Stahl mst...@redhat.com
Date:   Wed Aug 22 21:45:27 2012 +0200

SwTokenWindow::InsertAtSelection: fix STL assertion:

 error: attempt to copy-construct an iterator from a singular iterator.
(regression from 39b8a5f87f55abe53488c9c3c35b65fb0df84cde)

Change-Id: Iab29f4c356ea1cb5ca0f687bcfc5e54f185fbba3
(cherry picked from commit c47505a4525c342694ba4196544715467c2bdb8e)
Reviewed-on: https://gerrit.libreoffice.org/458
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index ffacb5d..5b8fef5 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3147,13 +3147,11 @@ voidSwTokenWindow::InsertAtSelection(
 ctrl_iterator iterActive = std::find(aControlList.begin(),
  aControlList.end(), pActiveCtrl);
 
-ctrl_iterator iterInsert = iterActive;
-
 Size aControlSize(GetOutputSizePixel());
 
 if( WINDOW_EDIT == pActiveCtrl-GetType())
 {
-++iterInsert;
+++iterActive;
 
 Selection aSel = ((SwTOXEdit*)pActiveCtrl)-GetSelection();
 aSel.Justify();
@@ -3169,7 +3167,7 @@ voidSwTokenWindow::InsertAtSelection(
 SwFormToken aTmpToken(TOKEN_TEXT);
 SwTOXEdit* pEdit = new SwTOXEdit(aCtrlParentWin, this, aTmpToken);
 
-iterInsert = aControlList.insert(iterInsert, pEdit);
+iterActive = aControlList.insert(iterActive, pEdit);
 
 pEdit-SetText(sRight);
 pEdit-SetSizePixel(aControlSize);
@@ -3181,7 +3179,7 @@ voidSwTokenWindow::InsertAtSelection(
 }
 else
 {
-aControlList.erase(iterActive);
+iterActive = aControlList.erase(iterActive);
 pActiveCtrl-Hide();
 delete pActiveCtrl;
 }
@@ -3189,7 +3187,7 @@ voidSwTokenWindow::InsertAtSelection(
 //now the new button
 SwTOXButton* pButton = new SwTOXButton(aCtrlParentWin, this, 
aToInsertToken);
 
-aControlList.insert(iterInsert, pButton);
+aControlList.insert(iterActive, pButton);
 
 pButton-SetPrevNextLink(LINK(this, SwTokenWindow, NextItemBtnHdl));
 pButton-SetGetFocusHdl(LINK(this, SwTokenWindow, TbxFocusBtnHdl));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change in core[libreoffice-3-6]: SwTokenWindow::InsertAtSelection: fix STL assertion:

From Miklos Vajna vmik...@suse.cz:

Miklos Vajna has submitted this change and it was merged.

Change subject: SwTokenWindow::InsertAtSelection: fix STL assertion:
..


SwTokenWindow::InsertAtSelection: fix STL assertion:

 error: attempt to copy-construct an iterator from a singular iterator.
(regression from 39b8a5f87f55abe53488c9c3c35b65fb0df84cde)

Change-Id: Iab29f4c356ea1cb5ca0f687bcfc5e54f185fbba3
(cherry picked from commit c47505a4525c342694ba4196544715467c2bdb8e)
---
M sw/source/ui/index/cnttab.cxx
1 file changed, 4 insertions(+), 6 deletions(-)

Approvals:
  Miklos Vajna: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iab29f4c356ea1cb5ca0f687bcfc5e54f185fbba3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz

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

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source

 sw/source/core/unocore/unocoll.cxx |   74 ++---
 1 file changed, 60 insertions(+), 14 deletions(-)

New commits:
commit 5ae1369a87ddc0293f6a78ef368179b6f8e43495
Author: Michael Stahl mst...@redhat.com
Date:   Wed Aug 22 23:04:34 2012 +0200

fdo#51514: SwXBookmarks: only consider real bookmarks:

Since CWS swrefactormarks2 the SwXBookmarks collection handles not only
bookmarks but at least cross-ref marks as well, which then bother users
when they show up in the Insert-Hyperlink dialog; remove non-bookmarks
again.
(regression from df6d312ca537402463e4eb0530f22b956600fc02)

Change-Id: I6a64ba8a43468dd3ce1569e944371d3ef71f8824
(cherry picked from commit 45be3ac8151d63ccb61879f876696704542a4ce7)
Reviewed-on: https://gerrit.libreoffice.org/459
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/sw/source/core/unocore/unocoll.cxx 
b/sw/source/core/unocore/unocoll.cxx
index 859cbd0..7de0788 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -86,6 +86,7 @@
 #include vbahelper/vbaaccesshelper.hxx
 #include basic/basmgr.hxx
 #include comphelper/processfactory.hxx
+#include comphelper/sequenceasvector.hxx
 
 using ::rtl::OUString;
 using namespace ::com::sun::star;
@@ -1644,7 +1645,20 @@ sal_Int32 SwXBookmarks::getCount(void)
 SolarMutexGuard aGuard;
 if(!IsValid())
 throw uno::RuntimeException();
-return GetDoc()-getIDocumentMarkAccess()-getBookmarksCount();
+
+sal_Int32 count(0);
+IDocumentMarkAccess* const pMarkAccess = 
GetDoc()-getIDocumentMarkAccess();
+for (IDocumentMarkAccess::const_iterator_t ppMark =
+pMarkAccess-getBookmarksBegin();
+ ppMark != pMarkAccess-getBookmarksEnd(); ++ppMark)
+{
+if (IDocumentMarkAccess::BOOKMARK ==
+IDocumentMarkAccess::GetType(**ppMark))
+{
+++count; // only count real bookmarks
+}
+}
+return count;
 }
 
 uno::Any SwXBookmarks::getByIndex(sal_Int32 nIndex)
@@ -1657,12 +1671,26 @@ uno::Any SwXBookmarks::getByIndex(sal_Int32 nIndex)
 if(nIndex  0 || nIndex = pMarkAccess-getBookmarksCount())
 throw IndexOutOfBoundsException();
 
-uno::Any aRet;
-::sw::mark::IMark* pBkmk = pMarkAccess-getBookmarksBegin()[nIndex].get();
-const uno::Reference text::XTextContent  xRef =
-SwXBookmark::CreateXBookmark(*GetDoc(), *pBkmk);
-aRet = xRef;
-return aRet;
+sal_Int32 count(0);
+for (IDocumentMarkAccess::const_iterator_t ppMark =
+pMarkAccess-getBookmarksBegin();
+ ppMark != pMarkAccess-getBookmarksEnd(); ++ppMark)
+{
+if (IDocumentMarkAccess::BOOKMARK ==
+IDocumentMarkAccess::GetType(**ppMark))
+{
+if (count == nIndex)
+{
+uno::Any aRet;
+const uno::Reference text::XTextContent  xRef =
+SwXBookmark::CreateXBookmark(*GetDoc(), **ppMark);
+aRet = xRef;
+return aRet;
+}
+++count; // only count real bookmarks
+}
+}
+throw IndexOutOfBoundsException();
 }
 
 uno::Any SwXBookmarks::getByName(const rtl::OUString rName)
@@ -1691,13 +1719,19 @@ uno::Sequence OUString  
SwXBookmarks::getElementNames(void)
 if(!IsValid())
 throw uno::RuntimeException();
 
+::comphelper::SequenceAsVector ::rtl::OUString  ret;
 IDocumentMarkAccess* const pMarkAccess = 
GetDoc()-getIDocumentMarkAccess();
-uno::SequenceOUString aSeq(pMarkAccess-getBookmarksCount());
-sal_Int32 nCnt = 0;
-for(IDocumentMarkAccess::const_iterator_t ppMark = 
pMarkAccess-getBookmarksBegin();
-ppMark != pMarkAccess-getBookmarksEnd();)
-aSeq[nCnt++] = (*ppMark++)-GetName();
-return aSeq;
+for (IDocumentMarkAccess::const_iterator_t ppMark =
+pMarkAccess-getBookmarksBegin();
+ ppMark != pMarkAccess-getBookmarksEnd(); ++ppMark)
+{
+if (IDocumentMarkAccess::BOOKMARK ==
+IDocumentMarkAccess::GetType(**ppMark))
+{
+ret.push_back((*ppMark)-GetName()); // only add real bookmarks
+}
+}
+return ret.getAsConstList();
 }
 
 sal_Bool SwXBookmarks::hasByName(const OUString rName)
@@ -1723,7 +1757,19 @@ sal_Bool SwXBookmarks::hasElements(void)
 SolarMutexGuard aGuard;
 if(!IsValid())
 throw uno::RuntimeException();
-return GetDoc()-getIDocumentMarkAccess()-getBookmarksCount() != 0;
+
+IDocumentMarkAccess* const pMarkAccess = 
GetDoc()-getIDocumentMarkAccess();
+for (IDocumentMarkAccess::const_iterator_t ppMark =
+pMarkAccess-getBookmarksBegin();
+ ppMark != pMarkAccess-getBookmarksEnd(); ++ppMark)
+{
+if (IDocumentMarkAccess::BOOKMARK ==
+IDocumentMarkAccess::GetType(**ppMark))
+{
+return true;
+}

[PUSHED] Change in core[libreoffice-3-6]: fdo#51514: SwXBookmarks: only consider real bookmarks:

From Miklos Vajna vmik...@suse.cz:

Miklos Vajna has submitted this change and it was merged.

Change subject: fdo#51514: SwXBookmarks: only consider real bookmarks:
..


fdo#51514: SwXBookmarks: only consider real bookmarks:

Since CWS swrefactormarks2 the SwXBookmarks collection handles not only
bookmarks but at least cross-ref marks as well, which then bother users
when they show up in the Insert-Hyperlink dialog; remove non-bookmarks
again.
(regression from df6d312ca537402463e4eb0530f22b956600fc02)

Change-Id: I6a64ba8a43468dd3ce1569e944371d3ef71f8824
(cherry picked from commit 45be3ac8151d63ccb61879f876696704542a4ce7)
---
M sw/source/core/unocore/unocoll.cxx
1 file changed, 60 insertions(+), 14 deletions(-)

Approvals:
  Miklos Vajna: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6a64ba8a43468dd3ce1569e944371d3ef71f8824
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz

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

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - svx/Library_svx.mk svx/source

 svx/Library_svx.mk |1 +
 svx/source/inc/filtnav.hxx |1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3e0f363d828618e86a0d6c7dac89040bfd37bed1
Author: Michael Stahl mst...@redhat.com
Date:   Wed Aug 22 12:49:08 2012 +0200

fdo#53888: svx: fix dependencies:

It appears that since cd0046bca0691fdca45a030903b7cde3bfee544c,
2 tinderboxes fail on including the generated sqlbison.hxx;
it turns out one of the inclusions of that in svx is unnecessary and the
other is used to call a virtual function, which can apparently be done
without linking; just link svx to dbtools anyway, that should fix the
build.

Change-Id: I7f7b1c4e9561c4dd2b820b173d05bdd5d4c6ba6d
(cherry picked from commit 01089138cc76f5717244bd04f25a868602aeaab6)
Reviewed-on: https://gerrit.libreoffice.org/456
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index ba8ffa1..f2bb177 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,svx,\
 comphelper \
 cppuhelper \
 cppu \
+dbtools \
 drawinglayer \
 editeng \
 i18nisolang1 \
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index c694aaa..5795a8f 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -48,7 +48,6 @@
 #include vcl/dockwin.hxx
 #include svx/fmtools.hxx
 #include fmexch.hxx
-#include connectivity/sqlparse.hxx
 #include sqlparserclient.hxx
 
 class FmFormShell;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change in core[libreoffice-3-6]: fdo#53888: svx: fix dependencies:

From Miklos Vajna vmik...@suse.cz:

Miklos Vajna has submitted this change and it was merged.

Change subject: fdo#53888: svx: fix dependencies:
..


fdo#53888: svx: fix dependencies:

It appears that since cd0046bca0691fdca45a030903b7cde3bfee544c,
2 tinderboxes fail on including the generated sqlbison.hxx;
it turns out one of the inclusions of that in svx is unnecessary and the
other is used to call a virtual function, which can apparently be done
without linking; just link svx to dbtools anyway, that should fix the
build.

Change-Id: I7f7b1c4e9561c4dd2b820b173d05bdd5d4c6ba6d
(cherry picked from commit 01089138cc76f5717244bd04f25a868602aeaab6)
---
M svx/Library_svx.mk
M svx/source/inc/filtnav.hxx
2 files changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Miklos Vajna: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f7b1c4e9561c4dd2b820b173d05bdd5d4c6ba6d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz

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

[PATCH] Change in core[libreoffice-3-6]: installer: remove empty directories again:

From Michael Stahl mst...@redhat.com:

Michael Stahl has uploaded a new change for review.

Change subject: installer: remove empty directories again:
..

installer: remove empty directories again:

An archive installer contains one empty share/extensions/dict-XY/
directory for every dictionary (except the 3 default ones), causing
numerous assertions about missing META-INF/manifest.xml and an extension
manager cluttered; this is due to overzealous removal of extension
prereg code.  (regression from
6dcb3d4ef46312729bb6f16c473b433474863f68, partially revert that)

(cherry picked from commit 8098a03d025a0c8fee90322e3835079edb45ade3)

Conflicts:
solenv/bin/modules/installer/simplepackage.pm

Change-Id: I3a063ebfed1012aeb27ec3076cdd5ca545f918a2
---
M solenv/bin/modules/installer/simplepackage.pm
M solenv/bin/modules/installer/systemactions.pm
2 files changed, 66 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/64/464/1
--
To view, visit https://gerrit.libreoffice.org/464
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a063ebfed1012aeb27ec3076cdd5ca545f918a2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl mst...@redhat.com

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

[Libreoffice-commits] .: connectivity/inc connectivity/source unusedcode.easy

 connectivity/inc/connectivity/CommonTools.hxx   |1 
 connectivity/source/commontools/CommonTools.cxx |   62 
 unusedcode.easy |1 
 3 files changed, 64 deletions(-)

New commits:
commit ff74564b39c6f0b2063158ffe7eb8faa99f12c4b
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 23 11:23:16 2012 +0100

callcatcher: update unusedcode

Change-Id: I18f823b99349002bb148d474a6a9aabdf2d419ef

diff --git a/connectivity/inc/connectivity/CommonTools.hxx 
b/connectivity/inc/connectivity/CommonTools.hxx
index 13999ab..ac1c0d9 100644
--- a/connectivity/inc/connectivity/CommonTools.hxx
+++ b/connectivity/inc/connectivity/CommonTools.hxx
@@ -50,7 +50,6 @@ namespace connectivity
 return match(rWild.getStr(), rStr.getStr(), cEscape);
 }
 
//--
-OOO_DLLPUBLIC_DBTOOLS rtl::OUString toString(const 
::com::sun::star::uno::Any rValue);
 OOO_DLLPUBLIC_DBTOOLS rtl::OUString toDateString(const 
::com::sun::star::util::Date rDate);
 OOO_DLLPUBLIC_DBTOOLS rtl::OUString toTimeString(const 
::com::sun::star::util::Time rTime);
 OOO_DLLPUBLIC_DBTOOLS rtl::OUString toDateTimeString(const 
::com::sun::star::util::DateTime rDateTime);
diff --git a/connectivity/source/commontools/CommonTools.cxx 
b/connectivity/source/commontools/CommonTools.cxx
index 2764c6d..d8bb7ff 100644
--- a/connectivity/source/commontools/CommonTools.cxx
+++ b/connectivity/source/commontools/CommonTools.cxx
@@ -152,68 +152,6 @@ namespace connectivity
 return rtl::OUString::createFromAscii(s);
 }
 
-
-
//--
-rtl::OUString toString(const Any rValue)
-{
-rtl::OUString aRes;
-TypeClass aDestinationClass = rValue.getValueType().getTypeClass();
-
-switch (aDestinationClass)
-{
-case TypeClass_CHAR:
-aRes = 
::rtl::OUString::valueOf(*(sal_Unicode*)rValue.getValue());
-break;
-case TypeClass_FLOAT:
-aRes = ::rtl::OUString::valueOf(*(float*)rValue.getValue());
-break;
-case TypeClass_DOUBLE:
-aRes = ::rtl::OUString::valueOf(*(double*)rValue.getValue());
-break;
-case TypeClass_BOOLEAN:
-aRes = 
::rtl::OUString::valueOf((sal_Int32)*(sal_Bool*)rValue.getValue());
-break;
-case TypeClass_BYTE:
-case TypeClass_SHORT:
-case TypeClass_LONG:
-aRes = 
::rtl::OUString::valueOf(*(sal_Int32*)rValue.getValue());
-break;
-case TypeClass_HYPER:
-{
-sal_Int64 nValue = 0;
-OSL_VERIFY( rValue = nValue );
-aRes = ::rtl::OUString::valueOf(nValue);
-}
-case TypeClass_STRING:
-rValue = aRes;
-break;
-case TypeClass_STRUCT:
-if (rValue.getValueType() == ::getCppuType((const 
::com::sun::star::util::Date*)0))
-{
-::com::sun::star::util::Date aDate;
-rValue = aDate;
-aRes = toDateString(aDate);
-}
-else if (rValue.getValueType() == ::getCppuType((const 
::com::sun::star::util::DateTime*)0))
-{
-::com::sun::star::util::DateTime aDT;
-rValue = aDT;
-aRes = toDateTimeString(aDT);
-}
-else if (rValue.getValueType() == ::getCppuType((const 
::com::sun::star::util::Time*)0))
-{
-::com::sun::star::util::Time aTime;
-rValue = aTime;
-aRes = toTimeString(aTime);
-}
-
-break;
-default:
-;
-}
-return aRes;
-}
-
 // 
-
 ::rtl::Reference jvmaccess::VirtualMachine  getJavaVM(const 
ReferenceXMultiServiceFactory  _rxFactory)
 {
diff --git a/unusedcode.easy b/unusedcode.easy
index e541859..f0992ae 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -68,7 +68,6 @@ connectivity::file::OStatement_Base::reset()
 connectivity::mozab::MQueryHelper::next()
 connectivity::sdbcx::OGroup::OGroup(rtl::OUString const, unsigned char)
 connectivity::sdbcx::OGroup::OGroup(unsigned char)
-connectivity::toString(com::sun::star::uno::Any const)
 dbtools::getConnection(rtl::OUString const, rtl::OUString const, 
rtl::OUString const, 
com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory 
const)
 formula::FormulaTokenIterator::First()
 framework::OReadMenuDocumentHandler::getServiceFactory()

[PATCH] factorise common code

From Lionel Elie Mamane lio...@mamane.lu:

Lionel Elie Mamane has uploaded a new change for review.

Change subject: factorise common code
..

factorise common code

Change-Id: I2d86714a0d951930de2389d920ea2cd04474e432
---
M reportdesign/source/filter/xml/xmlExport.cxx
1 file changed, 6 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/65/465/1
--
To view, visit https://gerrit.libreoffice.org/465
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d86714a0d951930de2389d920ea2cd04474e432
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu

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

[Libreoffice-commits] .: svtools/source

 svtools/source/misc/langtab.src |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 51b0ada7403b7959cd0753218bff34b7cd4a7a24
Author: Andras Timar ati...@suse.com
Date:   Thu Aug 23 15:36:27 2012 +0200

Moldovan - Romanian (Moldova)

Change-Id: I5d754099ca0ce2a82d1d89df4ab2b146b1cc2f4e

diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index bf44bbc..12a8deb 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -144,7 +144,6 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
  Malayalam ; LANGUAGE_MALAYALAM ;  ;
  Manipuri ; LANGUAGE_MANIPURI ;  ;
  Marathi ; LANGUAGE_MARATHI ;  ;
- Moldovan ; LANGUAGE_ROMANIAN_MOLDOVA ;  ;
  Nepali (Nepal) ; LANGUAGE_NEPALI ;  ;
  Nepali (India) ; LANGUAGE_NEPALI_INDIA ;  ;
  Norwegian, BokmÃ¥l ; LANGUAGE_NORWEGIAN_BOKMAL ;  ;
@@ -156,7 +155,8 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
  Portuguese (Brazil) ; LANGUAGE_PORTUGUESE_BRAZILIAN ;  ;
  Punjabi ; LANGUAGE_PUNJABI ;  ;
  Rhaeto-Romance ; LANGUAGE_RHAETO_ROMAN ;  ;
- Romanian ; LANGUAGE_ROMANIAN ;  ;
+ Romanian (Romania) ; LANGUAGE_ROMANIAN ;  ;
+ Romanian (Moldova) ; LANGUAGE_ROMANIAN_MOLDOVA ;  ;
  Russian ; LANGUAGE_RUSSIAN ;  ;
  Sanskrit ; LANGUAGE_SANSKRIT ;  ;
  Serbian Cyrillic (Serbia and Montenegro) ; 
LANGUAGE_SERBIAN_CYRILLIC ;  ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/bin

 solenv/bin/modules/installer/simplepackage.pm |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 7b4394f35b3557ffe61c8e9b0f0b630b31ca0977
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Aug 23 15:51:34 2012 +0200

...but remove obsolete prereg-specific code again

Change-Id: I98b20e2ef7f0ec8f609464980398ca09847b40e9

diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index 4111378..5bc319d 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -71,9 +71,8 @@ sub get_extensions_dir
 my $extensiondir = $subfolderdir . $installer::globals::separator;
 if ( $installer::globals::officedirhostname ne  ) { $extensiondir = 
$extensiondir . $installer::globals::officedirhostname . 
$installer::globals::separator; }
 my $extensionsdir = $extensiondir . share . 
$installer::globals::separator . extensions;
-my $preregdir = $extensiondir . share . $installer::globals::separator . 
prereg . $installer::globals::separator . bundled;
 
-return ( $extensionsdir, $preregdir );
+return $extensionsdir;
 }
 
 ##
@@ -671,7 +670,7 @@ sub create_simple_package
 installer::logger::print_message( ... removing superfluous directories 
...\n );
 installer::logger::include_header_into_logfile(Removing superfluous 
directories:);
 
-my ( $extensionfolder, $preregdir ) = get_extensions_dir($subfolderdir);
+my $extensionfolder = get_extensions_dir($subfolderdir);
 installer::systemactions::remove_empty_dirs_in_folder($extensionfolder);
 
 if ( $installer::globals::compiler =~ /^unxmacx/ )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

 sc/source/filter/excel/xeextlst.cxx |   11 +++
 sc/source/filter/inc/xeextlst.hxx   |   11 ++-
 2 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit a2cc10e02375aebd32ba0df49d83ee01235a709b
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Aug 23 16:03:38 2012 +0200

add missing licence header

diff --git a/sc/source/filter/excel/xeextlst.cxx 
b/sc/source/filter/excel/xeextlst.cxx
index 6155645..32041c5 100644
--- a/sc/source/filter/excel/xeextlst.cxx
+++ b/sc/source/filter/excel/xeextlst.cxx
@@ -1,3 +1,12 @@
+/* -*- 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/.
+ */
+
 #include xeextlst.hxx
 #include xeroot.hxx
 #include xehelper.hxx
@@ -244,3 +253,5 @@ XclExpExtRef XclExtLst::GetItem( XclExpExtType eType )
 
 return XclExpExtRef();
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/inc/xeextlst.hxx 
b/sc/source/filter/inc/xeextlst.hxx
index 57b2efe..6ce7b70 100644
--- a/sc/source/filter/inc/xeextlst.hxx
+++ b/sc/source/filter/inc/xeextlst.hxx
@@ -1,3 +1,12 @@
+/* -*- 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/.
+ */
+
 #ifndef SC_EXCEL_EXTLST_HXX
 #define SC_EXCEL_EXTLST_HXX
 
@@ -136,4 +145,4 @@ typedef boost::shared_ptr XclExtLst  XclExtLstRef;
 
 #endif
 
-
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - vcl/inc vcl/source

 vcl/inc/vcl/layout.hxx |5 +
 vcl/inc/vcl/tabctrl.hxx|   13 +
 vcl/source/control/tabctrl.cxx |  105 -
 vcl/source/window/layout.cxx   |   53 
 vcl/source/window/window2.cxx  |   38 --
 5 files changed, 134 insertions(+), 80 deletions(-)

New commits:
commit 8a2a5d01e8e8e25525d5873ca5caecbac5946a03
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 23 15:18:14 2012 +0100

we can need to redo the layout even when the sizes don't change

i.e. container remains the same size, but something inside it
has disappeared, requiring contents to be readjusted

We still want to minimize recalculations, so mark parent containers as 
dirty on
queue_resize of a widget and we can retain the layout tree of the clean ones
and just move them into their new positions as big fat blocks

Change-Id: I8c5d9b836b48c98765b5cc41be72eaa2913ae7d8

diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx
index 42071ce..c7af5b9 100644
--- a/vcl/inc/vcl/layout.hxx
+++ b/vcl/inc/vcl/layout.hxx
@@ -52,11 +52,16 @@ public:
 {
 return m_nBorderWidth;
 }
+void markLayoutDirty()
+{
+m_bLayoutDirty = true;
+}
 protected:
 virtual Size calculateRequisition() const = 0;
 virtual void setAllocation(const Size rAllocation) = 0;
 private:
 int m_nBorderWidth;
+bool m_bLayoutDirty;
 };
 
 class VCL_DLLPUBLIC VclBox : public VclContainer
diff --git a/vcl/inc/vcl/tabctrl.hxx b/vcl/inc/vcl/tabctrl.hxx
index 7d9257e..c8c92c6 100644
--- a/vcl/inc/vcl/tabctrl.hxx
+++ b/vcl/inc/vcl/tabctrl.hxx
@@ -67,6 +67,7 @@ private:
 sal_BoolmbRestoreHelpId;
 sal_BoolmbRestoreUnqId;
 sal_BoolmbSmallInvalidate;
+boolmbLayoutDirty;
 LinkmaActivateHdl;
 LinkmaDeactivateHdl;
 
@@ -197,6 +198,18 @@ public:
 
 // rename nOldId to nNewId);
 void ReassignPageId(sal_uInt16 nOldId, sal_uInt16 nNewId);
+
+using Control::SetPosSizePixel;
+virtual void SetPosSizePixel(const Point rNewPos, const Size rNewSize);
+virtual void SetSizePixel(const Size rNewSize);
+
+Size calculateRequisition() const;
+void setAllocation(const Size rAllocation);
+
+void markLayoutDirty()
+{
+mbLayoutDirty = true;
+}
 };
 
 #endif  // _SV_TABCTRL_HXX
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 11ea115..9a3e2f9 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -102,6 +102,8 @@ struct ImplTabCtrlData
 
 void TabControl::ImplInit( Window* pParent, WinBits nStyle )
 {
+mbLayoutDirty = true;
+
 if ( !(nStyle  WB_NOTABSTOP) )
 nStyle |= WB_TABSTOP;
 if ( !(nStyle  WB_NOGROUP) )
@@ -1238,7 +1240,7 @@ void TabControl::ImplPaint( const Rectangle rRect, bool 
bLayout )
 
 // ---
 
-void TabControl::Resize()
+void TabControl::setAllocation(const Size rAllocation)
 {
 ImplFreeLayoutData();
 
@@ -1262,7 +1264,7 @@ void TabControl::Resize()
 // Aktuelle TabPage resizen/positionieren
 sal_Bool bTabPage = ImplPosCurTabPage();
 // Feststellen, was invalidiert werden muss
-Size aNewSize = Control::GetOutputSizePixel();
+Size aNewSize = rAllocation;
 long nNewWidth = aNewSize.Width();
 for( std::vector ImplTabItem ::iterator it = 
mpTabCtrlData-maItemList.begin();
  it != mpTabCtrlData-maItemList.end(); ++it )
@@ -1295,6 +1297,29 @@ void TabControl::Resize()
 else
 Invalidate();
 }
+
+mbLayoutDirty = false;
+}
+
+void TabControl::SetPosSizePixel(const Point rNewPos, const Size rNewSize)
+{
+Window::SetPosSizePixel(rNewPos, rNewSize);
+//if size changed, TabControl::Resize got called already
+if (mbLayoutDirty)
+setAllocation(rNewSize);
+}
+
+void TabControl::SetSizePixel(const Size rNewSize)
+{
+Window::SetSizePixel(rNewSize);
+//if size changed, TabControl::Resize got called already
+if (mbLayoutDirty)
+setAllocation(rNewSize);
+}
+
+void TabControl::Resize()
+{
+setAllocation(Control::GetOutputSizePixel());
 }
 
 // ---
@@ -2142,57 +2167,55 @@ Point TabControl::GetItemsOffset() const
 
 // ---
 
-Size TabControl::GetOptimalSize(WindowSizeType eType) const
+Size TabControl::calculateRequisition() const
 {
-switch (eType) {
-case WINDOWSIZE_MINIMUM:
-return mpTabCtrlData ? mpTabCtrlData-maMinSize : Size();
+Size aOptimalPageSize(0, 0);
+long nTabLabelsBottom = 0;
+long nTotalTabLabelWidths = 0;
 
-default:
+for( std::vector ImplTabItem ::const_iterator it = 
mpTabCtrlData-maItemList.begin();
+ it !=

[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - vcl/inc vcl/source

 vcl/inc/vcl/builder.hxx   |   20 +--
 vcl/source/window/builder.cxx |   55 ++
 2 files changed, 37 insertions(+), 38 deletions(-)

New commits:
commit 367dfa8dd0cea9558d3922a0e0ab6e0c81e6fdbc
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 23 15:38:30 2012 +0100

Move all the state we need just during parsing to one place

and throw the lot away when finished with it

Change-Id: Ie64d3fa4cea41fa1ec956538616f73204957f311

diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index 7ee38b5..d77b139 100644
--- a/vcl/inc/vcl/builder.hxx
+++ b/vcl/inc/vcl/builder.hxx
@@ -75,7 +75,6 @@ private:
 {
 }
 };
-std::vectorModelAndId m_aModels;
 
 struct StringPair
 {
@@ -89,10 +88,8 @@ private:
 };
 
 typedef StringPair RadioButtonGroupMap;
-std::vectorRadioButtonGroupMap m_aGroupMaps;
-
 typedef StringPair ComboBoxModelMap;
-std::vectorComboBoxModelMap m_aModelMaps;
+
 ListStore *get_model_by_name(rtl::OString sID);
 static void mungemodel(ListBox rTarget, ListStore rStore);
 
@@ -108,22 +105,31 @@ private:
 m_aAdjustment.swap(rAdjustment);
 }
 };
-std::vectorAdjustmentAndId m_aAdjustments;
 
 typedef StringPair SpinButtonAdjustmentMap;
-std::vectorSpinButtonAdjustmentMap m_aAdjustmentMaps;
+
 Adjustment *get_adjustment_by_name(rtl::OString sID);
 static void mungeadjustment(NumericFormatter rTarget, Adjustment 
rAdjustment);
 
 typedef std::maprtl::OString, rtl::OString WidgetTranslations;
 typedef std::maprtl::OString, WidgetTranslations Translations;
-Translations m_aTranslations;
+
+struct ParserState
+{
+std::vectorRadioButtonGroupMap m_aGroupMaps;
+std::vectorComboBoxModelMap m_aModelMaps;
+std::vectorModelAndId m_aModels;
+std::vectorAdjustmentAndId m_aAdjustments;
+std::vectorSpinButtonAdjustmentMap m_aAdjustmentMaps;
+Translations m_aTranslations;
+};
 
 rtl::OString getTranslation(const rtl::OString rId, const rtl::OString 
rProperty) const;
 
 rtl::OString m_sID;
 rtl::OString m_sHelpRoot;
 Window *m_pParent;
+ParserState *m_pParserState;
 
 Window *get_by_name(rtl::OString sID);
 public:
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 379a6fc..c45494f 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -44,6 +44,7 @@ VclBuilder::VclBuilder(Window *pParent, rtl::OUString sUIDir, 
rtl::OUString sUIF
 : m_sID(sID)
 , m_sHelpRoot(rtl::OUStringToOString(sUIFile, RTL_TEXTENCODING_UTF8))
 , m_pParent(pParent)
+, m_pParserState(new ParserState)
 {
 sal_Int32 nIdx = m_sHelpRoot.lastIndexOf('.');
 if (nIdx != -1)
@@ -84,8 +85,8 @@ VclBuilder::VclBuilder(Window *pParent, rtl::OUString sUIDir, 
rtl::OUString sUIF
 handleChild(pParent, reader);
 
 //Set radiobutton groups when everything has been imported
-for (std::vectorRadioButtonGroupMap::iterator aI = m_aGroupMaps.begin(),
- aEnd = m_aGroupMaps.end(); aI != aEnd; ++aI)
+for (std::vectorRadioButtonGroupMap::iterator aI = 
m_pParserState-m_aGroupMaps.begin(),
+ aEnd = m_pParserState-m_aGroupMaps.end(); aI != aEnd; ++aI)
 {
 RadioButton *pOne = getRadioButton(aI-m_sID);
 RadioButton *pOther = getRadioButton(aI-m_sValue);
@@ -93,12 +94,10 @@ VclBuilder::VclBuilder(Window *pParent, rtl::OUString 
sUIDir, rtl::OUString sUIF
 if (pOne  pOther)
 pOne-group(*pOther);
 }
-//drop maps now
-std::vectorRadioButtonGroupMap().swap(m_aGroupMaps);
 
 //Set ComboBox models when everything has been imported
-for (std::vectorComboBoxModelMap::iterator aI = m_aModelMaps.begin(),
- aEnd = m_aModelMaps.end(); aI != aEnd; ++aI)
+for (std::vectorComboBoxModelMap::iterator aI = 
m_pParserState-m_aModelMaps.begin(),
+ aEnd = m_pParserState-m_aModelMaps.end(); aI != aEnd; ++aI)
 {
 ListBox *pTarget = getListBox(aI-m_sID);
 ListStore *pStore = get_model_by_name(aI-m_sValue);
@@ -106,18 +105,15 @@ VclBuilder::VclBuilder(Window *pParent, rtl::OUString 
sUIDir, rtl::OUString sUIF
 if (pTarget  pStore)
 mungemodel(*pTarget, *pStore);
 }
-//drop maps now
-std::vectorComboBoxModelMap().swap(m_aModelMaps);
-for (std::vectorModelAndId::iterator aI = m_aModels.begin(),
- aEnd = m_aModels.end(); aI != aEnd; ++aI)
+for (std::vectorModelAndId::iterator aI = 
m_pParserState-m_aModels.begin(),
+ aEnd = m_pParserState-m_aModels.end(); aI != aEnd; ++aI)
 {
 delete aI-m_pModel;
 }
-std::vectorModelAndId().swap(m_aModels);
 
 //Set SpinButton adjustments when everything has been imported
-for (std::vectorSpinButtonAdjustmentMap::iterator aI = 
m_aAdjustmentMaps.begin(),
- aEnd = m_aAdjustmentMaps.end(); aI !=

Re: [PATCH] factorise common code

2012-08-23 Thread Lionel Elie Mamane

On Thu, Aug 23, 2012 at 01:26:40PM +, Gerrit wrote:

 Lionel Elie Mamane has uploaded a new change for review.

 Change subject: factorise common code

I explicitly draw your attention on the fact that I submitted that for
review because this is based on the assumption that the code:

                         // start text:p
                         SvXMLElementExport 
aParagraphContent(*this,XML_NAMESPACE_TEXT, XML_P, sal_True,sal_False);
_                       ReferenceXServiceInfo 
xElement(aColIter-xElement,uno::UNO_QUERY);
                        ReferenceXReportComponent xReportComponent = 
aColIter-xElement;

Does not have any significant side effects (calling only constructors).

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

Re: [PATCH] factorise common code

On 23/08/12 17:22, Lionel Elie Mamane wrote:
 On Thu, Aug 23, 2012 at 01:26:40PM +, Gerrit wrote:
 
 Lionel Elie Mamane has uploaded a new change for review.
 
 Change subject: factorise common code
 
 I explicitly draw your attention on the fact that I submitted that for
 review because this is based on the assumption that the code:
 
  // start text:p
  SvXMLElementExport 
 aParagraphContent(*this,XML_NAMESPACE_TEXT, XML_P, sal_True,sal_False);

that will have a side effect, the SvXMLElementExport constructor opens a
text:p element via the SAX interface reachable in some way from this
and the destructor will close it.

 _   ReferenceXServiceInfo 
 xElement(aColIter-xElement,uno::UNO_QUERY);
 ReferenceXReportComponent xReportComponent = 
 aColIter-xElement;
 
 Does not have any significant side effects (calling only constructors).
 


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

[Libreoffice-commits] .: starmath/qa sw/qa

 dev/null |binary
 starmath/qa/testdocuments/README |2 
 sw/qa/extras/ooxmlexport/data/math-accents.docx  |binary
 sw/qa/extras/ooxmlexport/data/math-d.docx|binary
 sw/qa/extras/ooxmlexport/data/math-escaping.docx |binary
 sw/qa/extras/ooxmlexport/data/math-lim.docx  |binary
 sw/qa/extras/ooxmlexport/data/math-malformed_xml.docx|binary
 sw/qa/extras/ooxmlexport/data/math-matrix.docx   |binary
 sw/qa/extras/ooxmlexport/data/math-mso2k7.docx   |binary
 sw/qa/extras/ooxmlexport/data/math-nary.docx |binary
 sw/qa/extras/ooxmlexport/data/math-overbrace_underbrace.docx |binary
 sw/qa/extras/ooxmlexport/data/math-overstrike.docx   |binary
 sw/qa/extras/ooxmlexport/data/math-placeholders.docx |binary
 sw/qa/extras/ooxmlexport/data/math-rad.docx  |binary
 sw/qa/extras/ooxmlexport/data/math-subscripts.docx   |binary
 sw/qa/extras/ooxmlexport/data/math-vertical_stacks.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |  172 +++
 17 files changed, 172 insertions(+), 2 deletions(-)

New commits:
commit 863bd5f7b91792ab2d39567c206b23b25b661c50
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Thu Aug 23 17:11:52 2012 +0200

convert docx mathml test documents into unittests

There are few small things that do not survive the roundtrip completely
accurately, they should be checked somewhen when there's time. But it's
better to have these as actual tests rather than just documents somewhere.

Change-Id: Ic3732ab8450376820867950438d89e324f391eeb

diff --git a/starmath/qa/testdocuments/README b/starmath/qa/testdocuments/README
deleted file mode 100644
index 416e082..000
--- a/starmath/qa/testdocuments/README
+++ /dev/null
@@ -1,2 +0,0 @@
-You can find test documents here for DOCX. RTF test documents are at
-sw/qa/extras/rtfexport/data/math-*.rtf.
diff --git a/starmath/qa/testdocuments/docx/accents.docx 
b/starmath/qa/testdocuments/docx/accents.docx
deleted file mode 100644
index b623cb5..000
Binary files a/starmath/qa/testdocuments/docx/accents.docx and /dev/null differ
diff --git a/starmath/qa/testdocuments/docx/d.docx 
b/starmath/qa/testdocuments/docx/d.docx
deleted file mode 100644
index a18afdd..000
Binary files a/starmath/qa/testdocuments/docx/d.docx and /dev/null differ
diff --git a/starmath/qa/testdocuments/docx/escaping.docx 
b/starmath/qa/testdocuments/docx/escaping.docx
deleted file mode 100644
index d51c475..000
Binary files a/starmath/qa/testdocuments/docx/escaping.docx and /dev/null differ
diff --git a/starmath/qa/testdocuments/docx/lim.docx 
b/starmath/qa/testdocuments/docx/lim.docx
deleted file mode 100644
index 6adb548..000
Binary files a/starmath/qa/testdocuments/docx/lim.docx and /dev/null differ
diff --git a/starmath/qa/testdocuments/docx/malformed_xml.docx 
b/starmath/qa/testdocuments/docx/malformed_xml.docx
deleted file mode 100644
index 53d64b0..000
Binary files a/starmath/qa/testdocuments/docx/malformed_xml.docx and /dev/null 
differ
diff --git a/starmath/qa/testdocuments/docx/matrix.docx 
b/starmath/qa/testdocuments/docx/matrix.docx
deleted file mode 100644
index d6b5b18..000
Binary files a/starmath/qa/testdocuments/docx/matrix.docx and /dev/null differ
diff --git a/starmath/qa/testdocuments/docx/mso2k7.docx 
b/starmath/qa/testdocuments/docx/mso2k7.docx
deleted file mode 100644
index b6b16ef..000
Binary files a/starmath/qa/testdocuments/docx/mso2k7.docx and /dev/null differ
diff --git a/starmath/qa/testdocuments/docx/nary.docx 
b/starmath/qa/testdocuments/docx/nary.docx
deleted file mode 100644
index f3bb781..000
Binary files a/starmath/qa/testdocuments/docx/nary.docx and /dev/null differ
diff --git a/starmath/qa/testdocuments/docx/overbrace_underbrace.docx 
b/starmath/qa/testdocuments/docx/overbrace_underbrace.docx
deleted file mode 100644
index e4119f6..000
Binary files a/starmath/qa/testdocuments/docx/overbrace_underbrace.docx and 
/dev/null differ
diff --git a/starmath/qa/testdocuments/docx/overstrike.docx 
b/starmath/qa/testdocuments/docx/overstrike.docx
deleted file mode 100644
index 9809edc..000
Binary files a/starmath/qa/testdocuments/docx/overstrike.docx and /dev/null 
differ
diff --git a/starmath/qa/testdocuments/docx/placeholders.docx 
b/starmath/qa/testdocuments/docx/placeholders.docx
deleted file mode 100644
index 1c32c04..000
Binary files a/starmath/qa/testdocuments/docx/placeholders.docx and /dev/null 
differ
diff --git a/starmath/qa/testdocuments/docx/rad.docx 
b/starmath/qa/testdocuments/docx/rad.docx
deleted file mode 100644
index 39194dc..000
Binary files a/starmath/qa/testdocuments/docx/rad.docx and /dev/null differ
diff --git a/starmath/qa/testdocuments/docx/subscripts.docx 
b/starmath/qa/testdocuments/docx/subscripts.docx
deleted file

[Libreoffice-commits] .: 2 commits - writerfilter/source

 writerfilter/source/dmapper/DomainMapper.cxx  |   41 ++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   31 
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |3 +
 3 files changed, 47 insertions(+), 28 deletions(-)

New commits:
commit 5fd1516f82adf0330411adf90bee7e14cec856d5
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Aug 23 17:32:05 2012 +0200

refactor duplicated code to DomainMapper_Impl::getCurrentNumberingProperty

Change-Id: Id68df67e1301d0eed74c3bdcaabc7c601d72770b

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 205f586..4866e2d 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1037,35 +1037,8 @@ void DomainMapper::lcl_attribute(Id nName, Value  val)
 {
 // Word inherits FirstLineIndent property of the numbering, 
even if ParaLeftMargin is set, Writer does not.
 // So copy it explicitly, if necessary.
-PropertyMapPtr pContext = m_pImpl-GetTopContext();
-sal_Int32 nFirstLineIndent = 0;
-
-// See if we have a FirstLineIndent
-PropertyMap::iterator it = pContext-find(PropertyDefinition( 
PROP_NUMBERING_RULES, true ) );
-uno::Referencecontainer::XIndexAccess xNumberingRules;
-if (it != pContext-end())
-xNumberingRules.set(it-second, uno::UNO_QUERY);
-it = pContext-find(PropertyDefinition( PROP_NUMBERING_LEVEL, 
true ) );
-sal_Int32 nNumberingLevel = -1;
-if (it != pContext-end())
-it-second = nNumberingLevel;
-if (xNumberingRules.is()  nNumberingLevel != -1)
-{
-uno::Sequencebeans::PropertyValue aProps;
-xNumberingRules-getByIndex(nNumberingLevel) = aProps;
-for (int i = 0; i  aProps.getLength(); ++i)
-{
-const beans::PropertyValue rProp = aProps[i];
+sal_Int32 nFirstLineIndent = 
m_pImpl-getCurrentNumberingProperty(FirstLineIndent);
 
-if (rProp.Name == FirstLineIndent)
-{
-rProp.Value = nFirstLineIndent;
-break;
-}
-}
-}
-
-// Then copy it over.
 if (nFirstLineIndent != 0)
 
m_pImpl-GetTopContext()-Insert(PROP_PARA_FIRST_LINE_INDENT, true, 
uno::makeAny(nFirstLineIndent));
 
@@ -1079,39 +1052,9 @@ void DomainMapper::lcl_attribute(Id nName, Value  val)
 {
 // Word inherits FirstLineIndent/ParaLeftMargin property of 
the numbering, even if ParaRightMargin is set, Writer does not.
 // So copy it explicitly, if necessary.
-PropertyMapPtr pContext = m_pImpl-GetTopContext();
-sal_Int32 nFirstLineIndent = 0;
-sal_Int32 nParaLeftMargin = 0;
-
-// See if we have a FirstLineIndent / ParaLeftMargin
-PropertyMap::iterator it = pContext-find(PropertyDefinition( 
PROP_NUMBERING_RULES, true ) );
-uno::Referencecontainer::XIndexAccess xNumberingRules;
-if (it != pContext-end())
-xNumberingRules.set(it-second, uno::UNO_QUERY);
-it = pContext-find(PropertyDefinition( PROP_NUMBERING_LEVEL, 
true ) );
-sal_Int32 nNumberingLevel = -1;
-if (it != pContext-end())
-it-second = nNumberingLevel;
-if (xNumberingRules.is()  nNumberingLevel != -1)
-{
-uno::Sequencebeans::PropertyValue aProps;
-xNumberingRules-getByIndex(nNumberingLevel) = aProps;
-for (int i = 0; i  aProps.getLength(); ++i)
-{
-const beans::PropertyValue rProp = aProps[i];
-
-if (rProp.Name == FirstLineIndent)
-{
-rProp.Value = nFirstLineIndent;
-}
-else if (rProp.Name == IndentAt)
-{
-rProp.Value = nParaLeftMargin;
-}
-}
-}
+sal_Int32 nFirstLineIndent = 
m_pImpl-getCurrentNumberingProperty(FirstLineIndent);
+sal_Int32 nParaLeftMargin = 
m_pImpl-getCurrentNumberingProperty(IndentAt);
 
-// Then copy it over.
 if (nFirstLineIndent != 0)
 
m_pImpl-GetTopContext()-Insert(PROP_PARA_FIRST_LINE_INDENT, true, 
uno::makeAny(nFirstLineIndent));
 if (nParaLeftMargin != 0)
diff --git

[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - vcl/inc vcl/source

 vcl/inc/vcl/layout.hxx|   10 -
 vcl/inc/vcl/window.hxx|   16 
 vcl/inc/window.h  |5 ++
 vcl/source/window/layout.cxx  |   37 +---
 vcl/source/window/window.cxx  |5 ++
 vcl/source/window/window2.cxx |   75 ++
 6 files changed, 117 insertions(+), 31 deletions(-)

New commits:
commit 6bbcb2efa300b285e6fcfb545641d530c47cc173
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 23 16:43:09 2012 +0100

add left/right/top/bottom margin support

Change-Id: Ia43941071f3e1f1a364558e93928bce094d4c81f

diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx
index c7af5b9..1d1653a 100644
--- a/vcl/inc/vcl/layout.hxx
+++ b/vcl/inc/vcl/layout.hxx
@@ -42,16 +42,7 @@ public:
 virtual void SetPosSizePixel(const Point rNewPos, const Size rNewSize);
 virtual void SetPosPixel(const Point rAllocPos);
 virtual void SetSizePixel(const Size rAllocation);
-virtual bool set_property(const rtl::OString rKey, const rtl::OString 
rValue);
 
-void set_border_width(int nBorderWidth)
-{
-m_nBorderWidth = nBorderWidth;
-}
-int get_border_width() const
-{
-return m_nBorderWidth;
-}
 void markLayoutDirty()
 {
 m_bLayoutDirty = true;
@@ -60,7 +51,6 @@ protected:
 virtual Size calculateRequisition() const = 0;
 virtual void setAllocation(const Size rAllocation) = 0;
 private:
-int m_nBorderWidth;
 bool m_bLayoutDirty;
 };
 
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index 0f9c8a5..8ef3ce4 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -1187,6 +1187,21 @@ public:
  */
 void set_fill(bool bFill);
 
+void set_border_width(sal_Int32 nBorderWidth);
+sal_Int32 get_border_width() const;
+
+void set_margin_left(sal_Int32 nWidth);
+sal_Int32 get_margin_left() const;
+
+void set_margin_right(sal_Int32 nWidth);
+sal_Int32 get_margin_right() const;
+
+void set_margin_top(sal_Int32 nWidth);
+sal_Int32 get_margin_top() const;
+
+void set_margin_bottom(sal_Int32 nWidth);
+sal_Int32 get_margin_bottom() const;
+
 /*
  * Gets how the widget is packed with reference to the start or end of the 
parent
  */
@@ -1247,7 +1262,6 @@ public:
  */
 void set_grid_top_attach(sal_Int32 nAttach);
 
-
 /*
  * Sets a widget property
  *
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index cf27c16..dd7718b 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -323,6 +323,11 @@ public:
 sal_Int32   mnGridLeftAttach;
 sal_Int32   mnGridTopAttach;
 sal_Int32   mnGridWidth;
+sal_Int32   mnBorderWidth;
+sal_Int32   mnMarginLeft;
+sal_Int32   mnMarginRight;
+sal_Int32   mnMarginTop;
+sal_Int32   mnMarginBottom;
 sal_uInt8   mbFrame:1,
 mbBorderWin:1,
 mbOverlapWin:1,
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 2290edd..303f057 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -32,7 +32,6 @@
 
 VclContainer::VclContainer(Window *pParent)
 : Window(WINDOW_CONTAINER)
-, m_nBorderWidth(0)
 , m_bLayoutDirty(true)
 {
 ImplInit(pParent, 0, NULL);
@@ -44,20 +43,25 @@ Size VclContainer::GetOptimalSize(WindowSizeType eType) 
const
 return Window::GetOptimalSize(eType);
 
 Size aSize = calculateRequisition();
-aSize.Width() += m_nBorderWidth*2;
-aSize.Height() += m_nBorderWidth*2;
+sal_Int32 nBorderWidth = get_border_width();
+aSize.Width() += nBorderWidth*2 + get_margin_left() + get_margin_right();
+aSize.Height() += nBorderWidth*2 + get_margin_top() + get_margin_top();
 return aSize;
 }
 
 void VclContainer::SetPosSizePixel(const Point rAllocPos, const Size 
rAllocation)
 {
 Size aAllocation = rAllocation;
-aAllocation.Width() -= m_nBorderWidth*2;
-aAllocation.Height() -= m_nBorderWidth*2;
+sal_Int32 nBorderWidth = get_border_width();
+sal_Int32 nLeft = get_margin_left();
+sal_Int32 nTop = get_margin_top();
+
+aAllocation.Width() -= nBorderWidth*2 + nLeft + get_margin_right();
+aAllocation.Height() -= nBorderWidth*2 + nTop + get_margin_bottom();
 
 Point aAllocPos = rAllocPos;
-aAllocPos.X() += m_nBorderWidth;
-aAllocPos.Y() += m_nBorderWidth;
+aAllocPos.X() += nBorderWidth + nLeft;
+aAllocPos.Y() += nBorderWidth + nTop;
 
 bool bPosChanged = aAllocPos != GetPosPixel();
 bool bSizeChanged = aAllocation != GetSizePixel();
@@ -78,8 +82,9 @@ void VclContainer::SetPosSizePixel(const Point rAllocPos, 
const Size rAllocati
 void VclContainer::SetPosPixel(const Point rAllocPos)
 {
 Point aAllocPos = rAllocPos;
-aAllocPos.X() += m_nBorderWidth;
-aAllocPos.Y() += m_nBorderWidth;
+sal_Int32 nBorderWidth = get_border_width();

[Libreoffice-commits] .: 5 commits - sc/inc sc/source

 sc/inc/datauno.hxx  |6 +++---
 sc/source/core/data/cell.cxx|3 ++-
 sc/source/filter/oox/workbookhelper.cxx |   27 +++
 sc/source/filter/xml/xmlimprt.cxx   |2 --
 sc/source/ui/docshell/docsh.cxx |3 ++-
 5 files changed, 30 insertions(+), 11 deletions(-)

New commits:
commit 2ba43bc1b85471a1b91658c000f9cc268c799157
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Aug 23 11:47:49 2012 -0400

A little cleanup and avoid exporting all methods from ScDatabaseRangeObj.

Change-Id: I4dc7dc689af5d2e9d49584157171202aef873688

diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index 75bd893..2ddeb33 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -494,7 +494,7 @@ public:
 };
 
 
-class SC_DLLPUBLIC ScDatabaseRangeObj : public cppu::WeakImplHelper6
+class ScDatabaseRangeObj : public cppu::WeakImplHelper6
 com::sun::star::sheet::XDatabaseRange,
 com::sun::star::util::XRefreshable,
 com::sun::star::container::XNamed,
@@ -516,9 +516,9 @@ private:
 voidRefreshed_Impl();
 
 public:
-ScDatabaseRangeObj(ScDocShell* pDocSh, const 
String rNm);
-ScDatabaseRangeObj(ScDocShell* pDocSh, const SCTAB 
nTab);
-virtual ~ScDatabaseRangeObj();
+ScDatabaseRangeObj(ScDocShell* pDocSh, const String rNm);
+SC_DLLPUBLIC ScDatabaseRangeObj(ScDocShell* pDocSh, const SCTAB nTab);
+virtual ~ScDatabaseRangeObj();
 
 virtual voidNotify( SfxBroadcaster rBC, const SfxHint rHint 
);
 
diff --git a/sc/source/filter/oox/workbookhelper.cxx 
b/sc/source/filter/oox/workbookhelper.cxx
index 7d6aa77..d039498 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -480,8 +480,7 @@ Reference XDatabaseRange  
WorkbookGlobals::createUnnamedDatabaseRangeObject( c
aScRange.aEnd.Col(), 
aScRange.aEnd.Row() );
 rDoc.SetAnonymousDBData( aScRange.aStart.Tab() , pNewDBData );
 ScDocShell* pDocSh = static_cast ScDocShell* 
(rDoc.GetDocumentShell());
-ScDatabaseRangeObj* pDBRangeObj = new ScDatabaseRangeObj( pDocSh, 
aScRange.aStart.Tab() );
-xDatabaseRange.set( pDBRangeObj );
+xDatabaseRange.set(new ScDatabaseRangeObj(pDocSh, 
aScRange.aStart.Tab()));
 }
 catch( Exception )
 {
commit ccce242c3a8892f1bc5b649ca43a544cdced28d9
Author: Daniel Bankston daniel.e.banks...@gmail.com
Date:   Tue Aug 7 04:21:54 2012 -0500

Convert xlsx unnamed database range import to direct sc

Will evaluate later if further conversion is useful here

Change-Id: I6af5296b95075066335783e371d87be15f09f112

diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index afe59fd..75bd893 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -494,7 +494,7 @@ public:
 };
 
 
-class ScDatabaseRangeObj : public cppu::WeakImplHelper6
+class SC_DLLPUBLIC ScDatabaseRangeObj : public cppu::WeakImplHelper6
 com::sun::star::sheet::XDatabaseRange,
 com::sun::star::util::XRefreshable,
 com::sun::star::container::XNamed,
diff --git a/sc/source/filter/oox/workbookhelper.cxx 
b/sc/source/filter/oox/workbookhelper.cxx
index 701b2b8..7d6aa77 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -76,6 +76,10 @@
 #include rangenam.hxx
 #include tokenarray.hxx
 #include tokenuno.hxx
+#include convuno.hxx
+#include dbdata.hxx
+#include datauno.hxx
+#include globalnames.hxx
 
 #include formulabuffer.hxx
 namespace oox {
@@ -464,12 +468,20 @@ Reference XDatabaseRange  
WorkbookGlobals::createUnnamedDatabaseRangeObject( c
 
 // create database range and insert it into the Calc document
 Reference XDatabaseRange  xDatabaseRange;
-PropertySet aDocProps( mxDoc );
-Reference XUnnamedDatabaseRanges  xDatabaseRanges( 
aDocProps.getAnyProperty( PROP_UnnamedDatabaseRanges ), UNO_QUERY_THROW );
 if( bValidRange ) try
 {
-xDatabaseRanges-setByTable( aDestRange );
-xDatabaseRange.set( xDatabaseRanges-getByTable( aDestRange.Sheet ), 
UNO_QUERY );
+ScDocument rDoc =  getScDocument();
+if( rDoc.GetTableCount() = aDestRange.Sheet )
+throw ::com::sun::star::lang::IndexOutOfBoundsException();
+ScRange aScRange;
+ScUnoConversion::FillScRange(aScRange, aDestRange);
+ScDBData* pNewDBData = new ScDBData( STR_DB_LOCAL_NONAME, 
aScRange.aStart.Tab(),
+   aScRange.aStart.Col(), 
aScRange.aStart.Row(),
+   aScRange.aEnd.Col(), 
aScRange.aEnd.Row() );
+rDoc.SetAnonymousDBData( aScRange.aStart.Tab() , pNewDBData );
+ScDocShell* pDocSh =

[Libreoffice-commits] .: 7 commits - framework/source sc/source sd/source sfx2/source vcl/inc vcl/source vcl/unx

 framework/source/layoutmanager/toolbarlayoutmanager.cxx |4 -
 sc/source/ui/app/inputwin.cxx   |   23 +--
 sc/source/ui/inc/inputwin.hxx   |1 
 sd/source/ui/view/ViewShellBase.cxx |7 +-
 sfx2/source/view/impviewframe.hxx   |3 
 vcl/inc/vcl/decoview.hxx|3 
 vcl/inc/vcl/status.hxx  |4 -
 vcl/inc/vcl/window.hxx  |3 
 vcl/source/app/settings.cxx |2 
 vcl/source/window/brdwin.cxx|4 -
 vcl/source/window/decoview.cxx  |   15 
 vcl/source/window/status.cxx|   52 +---
 vcl/source/window/toolbox2.cxx  |4 -
 vcl/source/window/window.cxx|2 
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx|   14 +---
 15 files changed, 43 insertions(+), 98 deletions(-)

New commits:
commit 1a3f44e52b31c520d52261af8a2f92b88e107459
Author: Jan Holesovsky ke...@suse.cz
Date:   Thu Aug 23 08:08:38 2012 +0200

Fix typo in a comment (copied here and there).

Change-Id: Ic3c3e71a79ea8bf73a51fc7f001833d6ccedcb76

diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index aa6064f..421b65d 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -1508,7 +1508,7 @@ bool AllSettings::GetLayoutRTL() const
 nUIMirroring = 0; // ask configuration only once
 utl::OConfigurationNode aNode = 
utl::OConfigurationTreeRoot::tryCreateWithServiceFactory(
 vcl::unohelper::GetMultiServiceFactory(),
-OUString(org.openoffice.Office.Common/I18N/CTL) );// note: 
case sensisitive !
+OUString(org.openoffice.Office.Common/I18N/CTL) );// note: 
case sensitive !
 if ( aNode.isValid() )
 {
 sal_Bool bTmp = sal_Bool();
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 0a16c9d..d7920cf 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -2140,7 +2140,7 @@ sal_Bool ToolBox::AlwaysLocked()
 
 utl::OConfigurationNode aNode = 
utl::OConfigurationTreeRoot::tryCreateWithServiceFactory(
 vcl::unohelper::GetMultiServiceFactory(),
-OUString(/org.openoffice.Office.UI.GlobalSettings/Toolbars) );   
 // note: case sensisitive !
+OUString(/org.openoffice.Office.UI.GlobalSettings/Toolbars) );   
 // note: case sensitive !
 if ( aNode.isValid() )
 {
 // feature enabled ?
@@ -2153,7 +2153,7 @@ sal_Bool ToolBox::AlwaysLocked()
 // now read the locking state
 utl::OConfigurationNode aNode2 = 
utl::OConfigurationTreeRoot::tryCreateWithServiceFactory(
 vcl::unohelper::GetMultiServiceFactory(),
-
OUString(/org.openoffice.Office.UI.GlobalSettings/Toolbars/States) );// 
note: case sensisitive !
+
OUString(/org.openoffice.Office.UI.GlobalSettings/Toolbars/States) );// 
note: case sensitive !
 
 sal_Bool bLocked = sal_Bool();
 ::com::sun::star::uno::Any aValue2 = aNode2.getNodeValue( 
OUString(Locked) );
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index a39d855..73280fe 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -486,7 +486,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings 
rSettings, sal_Bool bCallHdl
 sal_Bool bTmp = sal_False, bAutoHCMode = sal_True;
 utl::OConfigurationNode aNode = 
utl::OConfigurationTreeRoot::tryCreateWithServiceFactory(
 vcl::unohelper::GetMultiServiceFactory(),
-OUString(org.openoffice.Office.Common/Accessibility) );// 
note: case sensisitive !
+OUString(org.openoffice.Office.Common/Accessibility) );// 
note: case sensitive !
 if ( aNode.isValid() )
 {
 ::com::sun::star::uno::Any aValue = aNode.getNodeValue( 
OUString(AutoDetectSystemHC) );
commit 35c9ffb2750178b558c71af12240cd5809a0314e
Author: Jan Holesovsky ke...@suse.cz
Date:   Thu Aug 23 07:57:53 2012 +0200

Fix off-by-one drawing problems of the bottom docking area.

Change-Id: Ic463f6829f7faa6d9667656f42f844a12d85518e

diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx 
b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index a7789bd..0fbd031 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -180,12 +180,12 @@ void 
ToolbarLayoutManager::implts_setDockingAreaWindowSizes( const awt::Rectangl
 if ( rBorderSpace.Height = 0 )
 {
 // Bottom docking area window
-sal_Int32 nBottomPos =

[Libreoffice-commits] .: sw/qa

 sw/qa/extras/ooxmlimport/data/n775906.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   |   19 ++-
 2 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 93d22852564b8d77b98fae902ce5f879272ca818
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Aug 23 17:54:54 2012 +0200

n#775906 testcase

Change-Id: Idafd1b7506dac77307190df275fb8ed35d40e5e5

diff --git a/sw/qa/extras/ooxmlimport/data/n775906.docx 
b/sw/qa/extras/ooxmlimport/data/n775906.docx
new file mode 100644
index 000..6b6dd1a
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/n775906.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 342f476..f82aaa3 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -83,6 +83,7 @@ public:
 void testNumbering1();
 void testBnc773061();
 void testAllGapsWord();
+void testN775906();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -110,6 +111,7 @@ public:
 CPPUNIT_TEST(testNumbering1);
 CPPUNIT_TEST(testBnc773061);
 CPPUNIT_TEST(testAllGapsWord);
+CPPUNIT_TEST(testN775906);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -638,7 +640,6 @@ void Test::testN766487()
 void Test::testN693238()
 {
 /*
- *
  * The problem was that a continous section break at the end of the doc 
caused the margins to be ignored.
  *
  * xray ThisComponent.StyleFamilies.PageStyles.Default.LeftMargin ' was 
2000, should be 635
@@ -719,6 +720,22 @@ void Test::testAllGapsWord()
 borderTest.testTheBorders(mxComponent);
 }
 
+void Test::testN775906()
+{
+/*
+ * The problem was that right margin (via direct formatting) erased the 
left/first margin (inherited from numbering style).
+ *
+ * oParas = ThisComponent.Text.createEnumeration
+ * oPara = oParas.nextElement
+ * xray oPara.ParaFirstLineIndent ' was 0
+ * xray oPara.ParaLeftMargin ' was 0
+ */
+load(n775906.docx);
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(-635), 
getPropertysal_Int32(getParagraph(1), ParaFirstLineIndent));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1905), 
getPropertysal_Int32(getParagraph(1), ParaLeftMargin));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Bug 38840 - Adding coverage analysis to unit tests

2012-08-23 Thread John Smith

Hi,


I just finished a first full run of lcov. There was one 'make check'
failure though, and there were a lot of 'warnings' running lcov that
may need some further investigation. Also, there is some stuff
included ('/usr/include/boost', for example) that might not be desired
in the report ?

I guess the main thing to do first now is to see if this report
actually makes any sense. Essentially, all code that gets executed by
'make check' on toplevel (which does dev-install and subsequentcheck,
and dev-install includes both unitcheck and slowcheck) should show up
as covered in the report. Maybe people that are familiar with the
contents of the checks/tests and what code/functionality they cover
can take a look at that ?

Anyway, the generated html report as it currently is can be found here :
http://dev-builds.libreoffice.org/lcov_reports/



Regards,


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

[Libreoffice-commits] .: sw/source

 sw/source/ui/docvw/HeaderFooterWin.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 442d0766eb9575a45572e29f2018bed2831c177f
Author: Ivan Timofeev timofeev@gmail.com
Date:   Thu Aug 23 20:15:51 2012 +0400

SwHeaderFooterWin: memory leak

Change-Id: Ie8322b93745c48970766c2033a23cca2c710a516

diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx 
b/sw/source/ui/docvw/HeaderFooterWin.cxx
index 9e4bc27..482ec7d 100644
--- a/sw/source/ui/docvw/HeaderFooterWin.cxx
+++ b/sw/source/ui/docvw/HeaderFooterWin.cxx
@@ -387,6 +387,7 @@ void SwHeaderFooterWin::Paint( const Rectangle )
 aSeq, BColorModifier( Color( COL_WHITE ).getBColor(), 1.0 - 
nFadeRate, BCOLORMODIFYMODE_INTERPOLATE ) ) );
 
 pProcessor-process( aGhostedSeq );
+delete pProcessor;
 }
 
 bool SwHeaderFooterWin::IsEmptyHeaderFooter( )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

 sw/source/core/doc/docnew.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f35aacfc765b5c296d62b4f2a32e6b0bb9bbe7e5
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Thu Aug 23 18:09:59 2012 +0200

initialize member

Introduced by b95d203bc17c83ec0fe5139f519d53ed1d842d3a .

Change-Id: I2497ee7cd55776fbd801d07470968e5aa47e971a

diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 1a89837..a6b50f0 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -336,6 +336,7 @@ SwDoc::SwDoc()
 mbUseFormerTextWrapping = aOptions.IsUseOurTextWrapping();
 mbConsiderWrapOnObjPos  = aOptions.IsConsiderWrappingStyle();
 mbMathBaselineAlignment = false;// default for 
*old* documents is 'off'
+mbStylesNoDefault   = false;
 mbAddFlyOffsets = false;// hidden
 mbOldNumbering  = false;// hidden
 mbUseHiResolutionVirtualDevice  = true; // hidden
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Bug 38840 - Adding coverage analysis to unit tests

2012-08-23 Thread Noel Grandin


Now that is very cool!

On 2012-08-23 18:09, John Smith wrote:

Hi,


I just finished a first full run of lcov. There was one 'make check'
failure though, and there were a lot of 'warnings' running lcov that
may need some further investigation. Also, there is some stuff
included ('/usr/include/boost', for example) that might not be desired
in the report ?

I guess the main thing to do first now is to see if this report
actually makes any sense. Essentially, all code that gets executed by
'make check' on toplevel (which does dev-install and subsequentcheck,
and dev-install includes both unitcheck and slowcheck) should show up
as covered in the report. Maybe people that are familiar with the
contents of the checks/tests and what code/functionality they cover
can take a look at that ?

Anyway, the generated html report as it currently is can be found here :
http://dev-builds.libreoffice.org/lcov_reports/



Regards,


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





Disclaimer: http://www.peralex.com/disclaimer.html


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

[Libreoffice-commits] .: dictionaries/da_DK

 dictionaries/da_DK/help/da/help.tree |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit d87fd7680041ffcb3546c94240505d1d4a020a99
Author: Andras Timar ati...@suse.com
Date:   Thu Aug 23 18:21:36 2012 +0200

Danish dictionary help tree snippet

Change-Id: Ic171c1cf2052aaf6b4f159f98f76cf5694cbbb8e

diff --git a/dictionaries/da_DK/help/da/help.tree 
b/dictionaries/da_DK/help/da/help.tree
index e96e47b..02db689 100644
--- a/dictionaries/da_DK/help/da/help.tree
+++ b/dictionaries/da_DK/help/da/help.tree
@@ -1,7 +1,9 @@
-?xml version=1.0 encoding=UTF-8? 
-tree_view
-help_section application=swriter id=Stavekontrolden_help1 title=Danske 
sprogvÃ¦rktÃ¸jer
+?xml version=1.0 encoding=UTF-8?
+tree_view
+help_section application=swriter id=02 title=Danske sprogvÃ¦rktÃ¸jer
+node id=0216 title=Danske sprogvÃ¦rktÃ¸jer
topic id=da/org.openoffice.da.hunspell.dictionaries/page1.xhpDanske 
Synonymer/topic
-   topic id=da/org.openoffice.da.hunspell.dictionaries/page2.xhpDansk 
stavekontrol/topic
-/help_section
-/tree_view
+   topic id=da/org.openoffice.da.hunspell.dictionaries/page2.xhpDansk 
stavekontrol/topic
+/node
+/help_section
+/tree_view
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: 'make check' failure

2012-08-23 Thread John Smith

On Thu, Aug 23, 2012 at 11:45 AM, Michael Stahl mst...@redhat.com wrote:

 reading the log you posted no you don't get a core file because
 soffice.bin didn't actually crash.

Ok, so how do we go about getting more detailed info that can assist
in solving the issue, then ? (assuming I can reproduce, of course) I
quickly tried a 'make
/usr/local/src/libreoffice/workdir/unxlngi6.pro/JunitTest/sc_unoapi/user'
as suggested in the logfile and that just gave me a 'nothing to do for
foo' response. Can I do a 'make clean' for just that test ?


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

Re: LibreOffice code coverage

2012-08-23 Thread bfo


Michael Stahl-2 wrote
 
 Did anyone make such report for LibreOffice codebase? 
 no, unfortunately we don't know how the unit test coverage ranks exactly
 on a scale from far too low to infinitesimal :-/
 
Hi.
Thanks to work of John Smith such report is available at
http://dev-builds.libreoffice.org/lcov_reports/.
Any comments?
Best regards.



--
View this message in context: 
http://nabble.documentfoundation.org/LibreOffice-code-coverage-tp3994901p4003168.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

[PATCH] Change in core[libreoffice-3-5]: SwHeaderFooterWin: memory leak

From Ivan Timofeev timofeev@gmail.com:

Ivan Timofeev has uploaded a new change for review.

Change subject: SwHeaderFooterWin: memory leak
..

SwHeaderFooterWin: memory leak

Change-Id: Ie8322b93745c48970766c2033a23cca2c710a516
(cherry picked from commit 442d0766eb9575a45572e29f2018bed2831c177f)
---
M sw/source/ui/docvw/HeaderFooterWin.cxx
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/67/467/1
--
To view, visit https://gerrit.libreoffice.org/467
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8322b93745c48970766c2033a23cca2c710a516
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-5
Gerrit-Owner: Ivan Timofeev timofeev@gmail.com

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

Re: Bug 38840 - Adding coverage analysis to unit tests

2012-08-23 Thread Philipp Riemer

That's great news! Thank you very much for your work!

Unfortunately, the report currently looks pretty red... But now we
have evidence and a way to trace pieces that need more tests.

Philipp

2012/8/23 John Smith lbalba...@gmail.com:
 Hi,


 I just finished a first full run of lcov. There was one 'make check'
 failure though, and there were a lot of 'warnings' running lcov that
 may need some further investigation. Also, there is some stuff
 included ('/usr/include/boost', for example) that might not be desired
 in the report ?

 I guess the main thing to do first now is to see if this report
 actually makes any sense. Essentially, all code that gets executed by
 'make check' on toplevel (which does dev-install and subsequentcheck,
 and dev-install includes both unitcheck and slowcheck) should show up
 as covered in the report. Maybe people that are familiar with the
 contents of the checks/tests and what code/functionality they cover
 can take a look at that ?

 Anyway, the generated html report as it currently is can be found here :
 http://dev-builds.libreoffice.org/lcov_reports/



 Regards,


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

Re: improving from address in gerrit emails to commits list?

2012-08-23 Thread Philipp Riemer

2012/8/23 Miklos Vajna vmik...@suse.cz:
 On Thu, Aug 23, 2012 at 09:52:53AM +0200, Noel Grandin n...@peralex.com 
 wrote:
 Is it possible to munge the From: address in the gerrit emails
 that go to the commit list?

 I got kind of used to seeing who did the commit in the from column
 of my email client, and I miss that :-)

 The script to hack is:

 /git/libreoffice/core.git/hooks/update at people.freedesktop.org, I'm
 attaching a trivial diff that could fix the issue (it sets the committer
 of the last commit as From, hopefully that's good enough). Michael,
 could you please apply it?

 Thanks,

 Miklos

Good idea! I am definitely a supporter of it!

However, I would prefer using %cN and %cE instead of the variants with
lower case.

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

Re: Bug 38840 - Adding coverage analysis to unit tests

2012-08-23 Thread bfo


John Smith wrote
 
 Anyway, the generated html report as it currently is can be found here :
 http://dev-builds.libreoffice.org/lcov_reports/
 
Hi.
Great work! I hope both reports will be generated regularly and help improve
quality of LO codebase.
Best regards.



--
View this message in context: 
http://nabble.documentfoundation.org/Bug-38840-Adding-coverage-analysis-to-unit-tests-tp4002357p4003185.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sysui/desktop

 sysui/desktop/macosx/Info.plist |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4908c8d79745057ebece07c7834e318a7366d6d0
Author: Dave davefilms...@gmail.com
Date:   Thu Aug 23 19:43:57 2012 +0200

Fix for fdo#46858 Have us show up in Productivity category in Finder

Change-Id: I19416bdef0e046102b78953d4663feaffa153722

diff --git a/sysui/desktop/macosx/Info.plist b/sysui/desktop/macosx/Info.plist
index 8100df2..c673a79 100755
--- a/sysui/desktop/macosx/Info.plist
+++ b/sysui/desktop/macosx/Info.plist
@@ -1403,6 +1403,8 @@
string1/string
keyNSPrincipalClass/key
stringVCL_NSApplication/string
+keyLSApplicationCategoryType/key
+stringpublic.app-category.productivity/string
 /dict
 /plist
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: android/sdremote

 android/sdremote/res/menu/selector_contextmenu.xml 
|4 
 android/sdremote/res/values/strings.xml
|1 
 android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java   
|   53 +++---
 
android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
 |   41 +--
 4 files changed, 70 insertions(+), 29 deletions(-)

New commits:
commit fb0a28df82aa67db4536232ab502a8cc85ac9e4f
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Thu Aug 23 20:23:34 2012 +0200

Removal of manually added servers.

Change-Id: Ia46eccb8c7ace05054e952f49e2a2c65a462b83f

diff --git a/android/sdremote/res/menu/selector_contextmenu.xml 
b/android/sdremote/res/menu/selector_contextmenu.xml
new file mode 100644
index 000..d3c99a1
--- /dev/null
+++ b/android/sdremote/res/menu/selector_contextmenu.xml
@@ -0,0 +1,4 @@
+?xml version=1.0 encoding=utf-8?
+menu xmlns:android=http://schemas.android.com/apk/res/android; 
+item android:id=@+id/selector_context_delete 
android:title=@string/selector_delete/item
+/menu
\ No newline at end of file
diff --git a/android/sdremote/res/values/strings.xml 
b/android/sdremote/res/values/strings.xml
index fb1ac80..61a3404 100644
--- a/android/sdremote/res/values/strings.xml
+++ b/android/sdremote/res/values/strings.xml
@@ -23,6 +23,7 @@
 string name=bluetoothBluetooth/string
 string name=wifiWI-FI/string
 string name=selector_noserversSearching for computersâ¦/string
+string name=selector_deleteRemove server/string
 string name=pairing_instructions_1In Impress, click on the Slideshow 
menu and select Impress Remote./string
 string name=pairing_instructions_2_deviceNameChoose \{0}\ as your 
device./string
 string name=pairing_instructions_3Then input this PIN:/string
diff --git 
a/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java 
b/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
index 0de5b01..5503408 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
@@ -95,11 +95,6 @@ public class SelectorActivity extends SherlockActivity {
 final View layout = inflater.inflate(R.layout.dialog_addserver,
 null);
 
-//TextView text = (TextView) 
layout.findViewById(R.id.text);
-//text.setText(Hello, this is a custom dialog!);
-//ImageView image = (ImageView) 
layout.findViewById(R.id.image);
-//image.setImageResource(R.drawable.android);
-
 builder = new AlertDialog.Builder(this);
 builder.setView(layout);
 builder.setTitle(R.string.addserver);
@@ -128,16 +123,6 @@ public class SelectorActivity extends SherlockActivity {
 alertDialog = builder.create();
 alertDialog.show();
 
-//Context mContext = getApplicationContext();
-//Dialog dialog = new Dialog(mContext);
-//
-//dialog.setContentView(R.layout.dialog_addserver);
-//dialog.setTitle(R.string.addserver);
-
-//TextView text = (TextView) 
dialog.findViewById(R.id.text);
-//text.setText(Hello, this is a custom dialog!);
-//ImageView image = (ImageView) 
dialog.findViewById(R.id.image);
-//image.setImageResource(R.drawable.android);
 return true;
 }
 return super.onOptionsItemSelected(item);
@@ -213,6 +198,20 @@ public class SelectorActivity extends SherlockActivity {
 private HashMapServer, View mBluetoothServers = new HashMapServer, 
View();
 private HashMapServer, View mNetworkServers = new HashMapServer, 
View();
 
+private void deleteServer(View aView) {
+for (EntryServer, View aEntry : mNetworkServers.entrySet()) {
+System.out.println(aEntry.getKey().getName());
+System.out.println(aView);
+System.out.println(aEntry.getValue());
+if (aEntry.getValue() == aView
+.findViewById(R.id.selector_sub_label)
+|| aEntry.getValue().findViewById(
+R.id.selector_sub_label) == aView
+
.findViewById(R.id.selector_sub_label))
+mCommunicationService.removeServer(aEntry.getKey());
+}
+}
+
 private void refreshLists() {
 if (mCommunicationService != null) {
 
@@ -256,6 +255,9 @@ public class SelectorActivity extends SherlockActivity {
 aText.setText(aServer.getName());
 aLayout.addView(aView);

Re: Bug 38840 - Adding coverage analysis to unit tests

On 23/08/12 18:09, John Smith wrote:
Hi,

I just finished a first full run of lcov. There was one 'make check'
failure though, and there were a lot of 'warnings' running lcov that
may need some further investigation. Also, there is some stuff
included ('/usr/include/boost', for example) that might not be desired
in the report ?

yes, everything under /usr/include is just noise, would be great to
filter that out.

hmm... it's a bit ugly that we have so many directories in solver that
headers are copied to, but i guess we have to live with that for now :)

I guess the main thing to do first now is to see if this report
actually makes any sense. Essentially, all code that gets executed by
'make check' on toplevel (which does dev-install and subsequentcheck,
and dev-install includes both unitcheck and slowcheck) should show up
as covered in the report. Maybe people that are familiar with the
contents of the checks/tests and what code/functionality they cover
can take a look at that ?

so looking at a few bits where i'm familiar with the tests tests like:

http://dev-builds.libreoffice.org/lcov_reports/master~2012-08-22_09.11.23/sax/source/tools/converter.cxx.gcov.html

it seems quite plausible.

but looking at

http://dev-builds.libreoffice.org/lcov_reports/master~2012-08-22_09.11.23/unoxml/source/dom/node.cxx.gcov.html
http://dev-builds.libreoffice.org/lcov_reports/master~2012-08-22_09.11.23/unoxml/source/rdf/librdf_repository.cxx.gcov.html

some functions that are definitely tested like
librdf_Repository::querySelect or CNode::insertBeforeshow up entirely
un-executed.

are you running the JUnit based tests as well? i.e. if you use
--without-java or --without-junit, that would negatively affect the test
coverage.

these are run during make subsequentcheck, you should have files like
workdir/*/JunitTest/unordf_complex/done.log.

Anyway, the generated html report as it currently is can be found here :
http://dev-builds.libreoffice.org/lcov_reports/

very good work!

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

Re: tail_build fail on missing includes

2012-08-23 Thread Norbert Thiebaud

On Thu, Aug 23, 2012 at 1:38 PM, Tomáš Chvátal tomas.chva...@gmail.com wrote:

 So for now I have no clue how to fix it and I would really welcome any
 help for it because this could rate as most annoying bug for Gentoo as
 1/3rd of users are hit by this stuff... I have it reproducing machine
 at work so anyone from us SUSErs can give me help without much
 problems.

could it be related to the fairly long path prefix:
/usr/portage/distfiles/portage/portage/app-office/libreoffice-3.6.0.4/work/libreoffice-core-3.6.0.4/

is it possible to hack emerge to test with a shortened path to see if
that change something ?

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

Usage of memset to eradicate string content

2012-08-23 Thread Arnaud Versini

Hi everyone,

I noticed in the code some annihilation of O[U]String content by using
memset or rtl_zeroMemory directly on the content as a password security. It
breaks encapsulation and the string immutability, not so good. I think
there is four possibilities, in order of my personal preference ;-) :

   1. Don't eradicate the string content, the content remain in RAM until
   the string deletion and a new allocation of the area
   2. Add a O[U]String eradicator for the password annihilation, better
   encapsulation of the String
   3. Use a modifiable StringBuffer or a char array like in Java for
   JPasswordField and eradicate its content
   4. Keep memset in the code

Thanks in advance for the clarification, I will do this after removing
rtl/memory.h internal usage task.
-- 
Arnaud Versini
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Usage of memset to eradicate string content

2012-08-23 Thread Tor Lillqvist



1. Don't eradicate the string content,

 I vote for this. Overwriting password in memory after use is security
theater.

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

[Libreoffice-commits] .: 4 commits - android/experimental android/qa basebmp/CppunitTest_basebmp.mk basebmp/Module_basebmp.mk basebmp/StaticLibrary_basebmp.mk Library_merged.mk Repository.mk solenv/gb

 Library_merged.mk |5 ++
 Repository.mk |   19 +++
 android/experimental/DocumentLoader/Makefile  |2 -
 android/experimental/LibreOffice4Android/Makefile |1 
 android/qa/desktop/Makefile   |1 
 android/qa/sc/Makefile|1 
 basebmp/CppunitTest_basebmp.mk|9 +
 basebmp/Module_basebmp.mk |9 +
 basebmp/StaticLibrary_basebmp.mk  |   37 ++
 solenv/gbuild/StaticLibrary.mk|2 +
 vcl/Library_vcl.mk|2 -
 11 files changed, 68 insertions(+), 20 deletions(-)

New commits:
commit a1aed54fee058fdedb7d50b96291af701a327e57
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Aug 23 22:23:33 2012 +0300

Build basebmp as a static library for Android

Reduces shared library count by one... This is tedious.

Change-Id: I3bdc0a5c4ee4cabf9bbcedc469ca6e94d0103d6b

diff --git a/Library_merged.mk b/Library_merged.mk
index 1ac02e5..b793544 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -123,8 +123,11 @@ $(eval $(call gb_Library_use_externals,merged,\
 endif
 
 ifeq ($(OS),ANDROID)
-$(eval $(call gb_Library_use_libraries,merged,\
+$(eval $(call gb_Library_use_static_libraries,merged,\
basebmp \
+))
+
+$(eval $(call gb_Library_use_libraries,merged,\
libotouch \
 ))
 
diff --git a/Repository.mk b/Repository.mk
index c8f9692..df57a96 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -215,7 +215,9 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 analysis \
 animcore \
 basctl \
-basebmp \
+$(if $(filter $(OS),ANDROID),, \
+   basebmp \
+) \
 bib \
 canvastools \
 communi \
@@ -628,6 +630,9 @@ $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \
 ))
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+$(if $(filter $(OS),ANDROID), \
+   basebmp \
+   ) \
 basegfx_s \
 codemaker \
 codemaker_cpp \
diff --git a/android/experimental/DocumentLoader/Makefile 
b/android/experimental/DocumentLoader/Makefile
index a6a2898..063bef2 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -52,7 +52,6 @@ copy-stuff:
 #
for F in $(strip \
   analysislo \
-  basebmplo \
   basegfxlo \
   bootstrap.uno \
   comphelpgcc3 \
diff --git a/android/experimental/LibreOffice4Android/Makefile 
b/android/experimental/LibreOffice4Android/Makefile
index 837f930..baeabdf 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -21,7 +21,6 @@ copy-stuff:
 #
for F in $(strip \
   analysislo \
-  basebmplo \
   basegfxlo \
   bootstrap.uno \
   chartcontrollerlo \
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 2fbd815..734cb56 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -92,7 +92,6 @@ copy-stuff: buildrcs
 #
for F in $(strip \
  analysislo \
- basebmplo \
  basegfxlo \
  bootstrap.uno \
  comphelpgcc3 \
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index b77c5cf..a455939 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -61,7 +61,6 @@ copy-stuff:
 #
for F in $(strip \
  analysislo \
- basebmplo \
  basegfxlo \
  bootstrap.uno \
  comphelpgcc3 \
diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk
index cbdfef6..f11b462 100644
--- a/basebmp/CppunitTest_basebmp.mk
+++ b/basebmp/CppunitTest_basebmp.mk
@@ -14,8 +14,17 @@ $(eval $(call gb_CppunitTest_set_include,basebmp_cpputest,\
 $$(INCLUDE) \
 ))
 
+ifeq ($(OS),ANDROID)
+$(eval $(call gb_CppunitTest_use_static_libraries,basebmp_cpputest,\
+basebmp \
+))
+else
 $(eval $(call gb_CppunitTest_use_libraries,basebmp_cpputest,\
 basebmp \
+))
+endif
+
+$(eval $(call gb_CppunitTest_use_libraries,basebmp_cpputest,\
 basegfx \
 sal \
 $(gb_STDLIBS) \
diff --git a/basebmp/Module_basebmp.mk b/basebmp/Module_basebmp.mk
index f6080f6..b1c45fe 100644
--- a/basebmp/Module_basebmp.mk
+++ b/basebmp/Module_basebmp.mk
@@ -9,8 +9,17 @@
 
 $(eval $(call gb_Module_Module,basebmp))
 
+ifeq ($(OS),ANDROID)
+$(eval $(call gb_Module_add_targets,basebmp,\
+StaticLibrary_basebmp \
+))
+else
 $(eval $(call gb_Module_add_targets,basebmp,\
 Library_basebmp \
+))
+endif
+
+$(eval $(call gb_Module_add_targets,basebmp,\
 Package_inc \
 ))
 
diff --git a/basebmp/StaticLibrary_basebmp.mk

Re: [GSOC] Calc Performance Project End

2012-08-23 Thread Daniel Bankston


On 08/21/2012 10:50 AM, Michael Meeks wrote:
Thanks for applying, and working dilligently; hopefully you can spread 
the news about how cool it is to hack on LibreOffice for GSOC and 
we'll have you  your friends back again next year ? :-) All the best, 
Michael. 
I've already been telling people I had a great experience, but I'll 
continue to do so!  I will graduate after this fall semester so I won't 
be able to return again as GSOC student, but I do plan to continue to 
contribute to LibreOffice as I have time (which may be little during the 
school semester).


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

[GSOC-UPDATE](23.08) Impress Remote

2012-08-23 Thread Andrzej J. R. Hunt


Hi everyone,

Today I did the following:
- Disabled bluetooth (Linux) for glib  2.26 since dbus isn't available 
in gio until then. (Is it worth looking into using dbus-glib instead? I 
only do one dbus call at startup, and possibly one at shutdown -- 
everything else is via sockets.)

- Added manual server ip entry, and permanent storage of such entries.
- Added deletion of manual entries.

If my bluetooth dongle arrives tomorrow I'll try and get bluetooth on 
windows running (the api seems fairly similar to that on linux, except 
service advertising doesn't need dbus, which was the main issue with the 
Linux implementation). However I've noticed that there are multiple 
bluetooth stacks with different api's on windows -- initially I'll use 
the windows api, but the widcomm stack also seems to be quite common 
(I'll be looking at the bluecove library once again for inspiration). 
I'll probably discover more as I actually write and test the code.


If I don't have a bluetooth dongle tomorrow I'll probably implement the 
error/reconnection screen and necessary code. For this I think it would 
be worth having a mechanism of saving approved clients in Libreoffice to 
avoid the need for repeated pin entry (i.e. the first time a client 
connects it has to pair using the pin, after this it never has to 
authenticate again). This would be similar to the way that bluetooth 
pairs devices on their first connection (the OS / bluetooth stack 
dealing with the pin) after which authentication isn't required again. 
(For bluetooth I don't bother with the pin entry screen, as the user 
will have already approved the device via a popup window created by the 
OS / desktop.)


I've also been looking at filtering bluetooth devices in the app: 
currently on the selection screen I list all bluetooth devices that are 
discovered. It is theoretically possible to use SDP to detect whether 
the device runs LibO, but this is only available on Android API =15 
(4.0.3) -- is it worth adding such filtering, and should I leave it 
until later as a low priority item? It is also possible on I think all 
android versions to detect what type of device you have found (laptop, 
smartphone, toy, scales, see 
http://developer.android.com/reference/android/bluetooth/BluetoothClass.Device.html 
for more ) -- is it worth filtering out anything but COMPUTER_*  and 
possibly PHONE_SMART (I'm not sure what tablets are classed as yet -- 
but I assume we want to have the option of a tablet running a 
presentation being controlled by a phone as well)?


Cheers,

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

[PATCH] Modified the wording of the Save-on-Exit-Dialog

2012-08-23 Thread Samuel Mehrbrodt


Hi,

I have a suggestion to change the wording of the Dialog which appears 
when you close a document and unsaved changes exist.


See attached images with the difference before/after.

I wrote a mail to the ux-advise list [1] before and asked if this could 
be changed, but there was no reply (except one came to me directly, he 
was ok with it).


I would also like to change the button order (move the Save button to 
the right), but I don't know how it fits with Windows/Mac.


I needed to create a new translation string for the dialog title, is 
that ok the way I did it? Did I forget something?


Thanks,
Samuel

[1] 
http://nabble.documentfoundation.org/Libreoffice-ux-advise-Exit-Dialog-Button-Order-and-Wording-tp4001483.html
From 56e70a37ac203f361bb4a493cc1562fc9038f045 Mon Sep 17 00:00:00 2001
From: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date: Thu, 23 Aug 2012 21:33:05 +0200
Subject: [PATCH] Modified the wording of the Save-on-Exit-Dialog

Change-Id: I1714f254c4fb279bbb9e67881641566c21b7ec35
---
 sfx2/inc/sfx2/sfx.hrc |1 +
 sfx2/source/doc/QuerySaveDocument.cxx |1 +
 sfx2/source/doc/doc.src   |8 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index 0d44061..c215a18 100644
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -162,6 +162,7 @@
 #define STR_KB  (RID_SFX_START+112)
 #define STR_MB  (RID_SFX_START+113)
 #define STR_GB  (RID_SFX_START+114)
+#define STR_QUERY_SAVE_DOCUMENT_TITLE   (RID_SFX_START+115)
 
 #define STR_STANDARD_SHORTCUT   (RID_SFX_START+117)
 #define STR_REPAIREDDOCUMENT(RID_SFX_START+118)
diff --git a/sfx2/source/doc/QuerySaveDocument.cxx b/sfx2/source/doc/QuerySaveDocument.cxx
index 2510e9a..fdcb870 100644
--- a/sfx2/source/doc/QuerySaveDocument.cxx
+++ b/sfx2/source/doc/QuerySaveDocument.cxx
@@ -36,6 +36,7 @@ short ExecuteQuerySaveDocument(Window* _pParent,const String _rTitle)
 aText.SearchAndReplace( DEFINE_CONST_UNICODE( $(DOC) ),
 _rTitle );
 QueryBox aQBox( _pParent, WB_YES_NO_CANCEL | WB_DEF_YES, aText );
+aQBox.SetText(SfxResId(STR_QUERY_SAVE_DOCUMENT_TITLE).toString());
 aQBox.SetButtonText( BUTTONID_NO, SfxResId(STR_NOSAVEANDCLOSE).toString() );
 aQBox.SetButtonText( BUTTONID_YES, SfxResId(STR_SAVEDOC).toString() );
 return aQBox.Execute();
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index 3b5293d..640283d 100644
--- a/sfx2/source/doc/doc.src
+++ b/sfx2/source/doc/doc.src
@@ -46,9 +46,13 @@ QueryBox MSG_REGION_NOTEMPTY
 DefButton = WB_DEF_NO ;
 Message [ en-US ] = The category is not empty.\nDelete anyway? ;
 };
+String STR_QUERY_SAVE_DOCUMENT_TITLE
+{
+Text [ en-US ] = Save document ;
+};
 String STR_QUERY_SAVE_DOCUMENT
 {
-Text [ en-US ] = The document \$(DOC)\ has been modified.\nDo you want to save your changes? ;
+Text [ en-US ] = Save changes to document \$(DOC)\ before closing? ;
 };
 Bitmap BMP_STYLES_CLOSED { File = newex.bmp ; };
 Bitmap BMP_STYLES_OPENED { File = newex.bmp ; };
@@ -307,7 +311,7 @@ String STR_DOCTYPENAME_MESSAGE
 
 String STR_NOSAVEANDCLOSE
 {
-Text [ en-US ] = ~Discard ;
+Text [ en-US ] = Close ~without saving ;
 };
 
 String STR_PACKNGO_NOACCESS
-- 
1.7.9.5

attachment: after.pngattachment: before.png___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] Modified the wording of the Save-on-Exit-Dialog

2012-08-23 Thread Jean-Tiare LE BIGOT


Wow, Much nicer this way !

Le 2012-08-23 21:47, Samuel Mehrbrodt a écrit :

Hi,

I have a suggestion to change the wording of the Dialog which appears
when you close a document and unsaved changes exist.

See attached images with the difference before/after.

I wrote a mail to the ux-advise list [1] before and asked if this
could be changed, but there was no reply (except one came to me
directly, he was ok with it).

I would also like to change the button order (move the Save button to
the right), but I don't know how it fits with Windows/Mac.

I needed to create a new translation string for the dialog title, is
that ok the way I did it? Did I forget something?

Thanks,
Samuel

[1]

http://nabble.documentfoundation.org/Libreoffice-ux-advise-Exit-Dialog-Button-Order-and-Wording-tp4001483.html

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


--
Jean-Tiare LE BIGOT
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Usage of memset to eradicate string content

On 23/08/12 21:12, Tor Lillqvist wrote:
  1. Don't eradicate the string content,
 
 I vote for this. Overwriting password in memory after use is security
 theater.

well it doesn't protect against every threat but i wouldn't call it mere
theater; if you don't overwrite the password it may well happen that
that piece of memory is not allocated to something else and swapped out,
and then you have the password on disk.  (yes of course i'm running
encrypted swap but please think of mere office users.)

Viega  Messier's Secure Programming Cookbook for C and C++ devote
section 13.2 Erasing Data from Memory Securely (3 pages) to the topic,
warning readers that relying on standard memset function is dangerous
because optimizing compilers may optimize the calls away if there is no
subsequent use, and recommend a hand-written memset with volatile char
* parameter instead.

i don't think storing passwords in OUStrings is a good idea to begin
with; something with a special purpose interface for that which does the
right thing by default would be better; ideally the buffer used would be
locked into memory to prevent it being swapped to disk (is it possible
to do that as a non-root process?).

of course i wouldn't be at all surprised if for the existing
password-clearing uses there were a bunch of copies of the string made
along the way that aren't cleared; that mistake is is just too easy to
make if you use a generic string type.


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

remove two empty methods

From Norbert Thiebaud nthieb...@gmail.com:

Norbert Thiebaud has abandoned this change.

Change subject: remove two empty methods
..


Patch Set 1: Abandoned

already fix some other way by caolan

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: Iadf5948fd3657916fa4056536fc71285171a45ea
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Thomas Arnhold tho...@arnhold.org
Gerrit-Reviewer: Andras Timar ati...@suse.com
Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com

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

Re: Usage of memset to eradicate string content

2012-08-23 Thread Tor Lillqvist

But if the password is used to load or save encrypted documents, then the
contents of the document (which the so carefully erased password protects)
is loaded into memory in plain-text, and is equally readable by an
adversary that has access to the virtual memory of your process, and might
get paged out to disk. So what's the win?

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

[Libreoffice-commits] .: configure.in

 configure.in |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 361991a27183d340ae183178147bb22cd166a19c
Author: Rene Engelhard r...@debian.org
Date:   Thu Aug 23 22:31:26 2012 +0200

actually set P_SEP aka. PATH_SEPERATOR on kFreeBSD to fix Java builds...

Change-Id: I5e84cf342ab9a7017bf61dbb455548105b867e50

diff --git a/configure.in b/configure.in
index 3f22631..26b0877 100644
--- a/configure.in
+++ b/configure.in
@@ -3339,6 +3339,8 @@ kfreebsd*)
 GUIBASE=unx
 OS=LINUX
 RTL_OS=kFreeBSD
+P_SEP=:
+
 case $host_cpu in
 
 i*86)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Usage of memset to eradicate string content

On 23/08/12 22:15, Tor Lillqvist wrote:
 But if the password is used to load or save encrypted documents, then
 the contents of the document (which the so carefully erased password
 protects) is loaded into memory in plain-text, and is equally readable
 by an adversary that has access to the virtual memory of your process,
 and might get paged out to disk. So what's the win?

that is true for the document that is protected by the password.
but in practice that same password may not only give access to that one
document, but also let an attacker do other nefarious things like log on
to twitter and impersonate the user's cat.


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

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - configure.in

 configure.in |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a11a3352ff049ae7f4d9780fd1c694cc560dc8e4
Author: Rene Engelhard r...@debian.org
Date:   Thu Aug 23 22:31:26 2012 +0200

actually set P_SEP aka. PATH_SEPERATOR on kFreeBSD to fix Java builds...

Change-Id: I5e84cf342ab9a7017bf61dbb455548105b867e50
Reviewed-on: https://gerrit.libreoffice.org/468
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/configure.in b/configure.in
index 2cd5055..a080a02 100644
--- a/configure.in
+++ b/configure.in
@@ -3126,6 +3126,8 @@ kfreebsd*)
 GUIBASE=unx
 OS=LINUX
 RTL_OS=kFreeBSD
+P_SEP=:
+
 case $host_cpu in
 
 i*86)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change in core[libreoffice-3-6]: actually set P_SEP aka. PATH_SEPERATOR on kFreeBSD to fix Ja...

From Norbert Thiebaud nthieb...@gmail.com:

Norbert Thiebaud has submitted this change and it was merged.

Change subject: actually set P_SEP aka. PATH_SEPERATOR on kFreeBSD to fix Java 
builds...
..


actually set P_SEP aka. PATH_SEPERATOR on kFreeBSD to fix Java builds...

Change-Id: I5e84cf342ab9a7017bf61dbb455548105b867e50
---
M configure.in
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Norbert Thiebaud: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5e84cf342ab9a7017bf61dbb455548105b867e50
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Rene Engelhard rene.engelhard...@googlemail.com
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com

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

[PATCH] Change in core[libreoffice-3-6]: actually set P_SEP aka. PATH_SEPERATOR on kFreeBSD to fix Ja...

From Rene Engelhard rene.engelhard...@googlemail.com:

Rene Engelhard has uploaded a new change for review.

Change subject: actually set P_SEP aka. PATH_SEPERATOR on kFreeBSD to fix Java 
builds...
..

actually set P_SEP aka. PATH_SEPERATOR on kFreeBSD to fix Java builds...

Change-Id: I5e84cf342ab9a7017bf61dbb455548105b867e50
---
M configure.in
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/68/468/1
--
To view, visit https://gerrit.libreoffice.org/468
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e84cf342ab9a7017bf61dbb455548105b867e50
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Rene Engelhard rene.engelhard...@googlemail.com

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

Re: tail_build fail on missing includes

Hi Tomáš,

On 23 August 2012 20:38, Tomáš Chvátal tomas.chva...@gmail.com wrote:
 I am not exactly sure why the deps are not picked by
 gbuild but when I fiddled with it and added the direct dep over
 sfx2_inc the code built bit further and again it died on missing
 svtools_inc. When that worked it proceeded to another module, where it
 again failed on some missing includes. This leads me to conclusion
 that there must be something systematic wrong.

Well, it should work like this (simplifying):
avmedia links against (and depends on) sfx and sfx depends on sfx2_inc package.

The something systematic wrong is --enable-mergelibs I am afraid.
Both libraries are merged and somehow the dependency on package is not
inherited.
I think I can see what's the problem and I will fix it.
--enable-mergelibs is not well tested (widely used) I guess, sorry for this.
I never had such problem, probably because I don't build with
--with-max-jobs=1 --with-num-cpus=1.

Thanks for testing --enable-mergelibs,
All the best,
Matus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: tail_build fail on missing includes

2012-08-23 Thread Norbert Thiebaud

On Thu, Aug 23, 2012 at 3:47 PM, Matúš Kukan matus.ku...@gmail.com wrote:
 Hi Tomáš,

 On 23 August 2012 20:38, Tomáš Chvátal tomas.chva...@gmail.com wrote:
 I am not exactly sure why the deps are not picked by
 gbuild but when I fiddled with it and added the direct dep over
 sfx2_inc the code built bit further and again it died on missing
 svtools_inc. When that worked it proceeded to another module, where it
 again failed on some missing includes. This leads me to conclusion
 that there must be something systematic wrong.

 Well, it should work like this (simplifying):
 avmedia links against (and depends on) sfx and sfx depends on sfx2_inc 
 package.

on face value that would not be enough: the dep on sfx _library_ does
not prevent the compile of avmedia source... only the link
so I suspect that if is avmedia_inc that depend on sfx2_inc  (and the
compile of avmedia do depend on avmedia_inc

anyhow... you are prolly right nonetheless with --merged-libs, since
the dep avmedia_inc - sfx2_inc is probably introduced by the use_libs
api... which --merged-libs prolly mess with

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

Re: [Libreoffice-commits] Revert installer: Use hashref for replace_all_ziplistvariables_in_rtffile

On 23 August 2012 10:43, Michael Meeks michael.me...@suse.com wrote:

 It's a shame to loose Tim's nice unit test too - I love tests for
 make_installer.pl :-) Might be nice as/when this is nailed to have some
 gnumake guru to help connect them into the build.

Bah, you don't need to be gnumake guru. You just need to know the
command and when to run it.
I guess adding CustomTarget into solenv is fine.
Something like:

$(eval $(call 
gb_CustomTarget_CustomTarget,solenv/name-for-this-really-nice-perl-test))

$(call gb_CustomTarget_get_target,solenv/name-for-this-really-nice-perl-test) :
I-want-to-run-this-command

that's all.

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

Re: tail_build fail on missing includes

On 23 August 2012 22:54, Norbert Thiebaud nthieb...@gmail.com wrote:
 Well, it should work like this (simplifying):

I mean really simplifying.. or ignoring details.. so it also may become untrue.

 avmedia links against (and depends on) sfx and sfx depends on sfx2_inc 
 package.

 on face value that would not be enough: the dep on sfx _library_ does
 not prevent the compile of avmedia source... only the link
 so I suspect that if is avmedia_inc that depend on sfx2_inc  (and the
 compile of avmedia do depend on avmedia_inc

it's not only dependency for first linking sfx then avmedia.
There is also external headers target,
so before any object file of avmedia library is created, all headers
associated with sfx must be in place.

 anyhow... you are prolly right nonetheless with --merged-libs, since
 the dep avmedia_inc - sfx2_inc is probably introduced by the use_libs
 api... which --merged-libs prolly mess with

exactly, I was never sure I've done it right, but it seemed to be
working so far.

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

Re: Usage of memset to eradicate string content

2012-08-23 Thread Tor Lillqvist

 that is true for the document that is protected by the password.
 but in practice that same password may not only give access to that one
 document, but also let an attacker do other nefarious things like log on
 to twitter and impersonate the user's cat.


Hmm, but why use password-protected documents only for yourself? No idea,
but isn't it more likely that such documents are passed between *several*
people? Thus making it less likely one would use some important personal
password to protect it? Unless one also wants the other people to be able
to impersonate oneself on twitter etc. But whatever, sure, if there is a
strong feeling that erasing password strings from memory does improve
security, I am not going to argue any more. Especially as I guess we want
to avoid giving any impression that we would be intentionally weakening
security, real or not... that would be bad publicity.

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

[PATCH] gbuild: also in libmerge case library needs to depend on all...

From Matúš Kukan matus.ku...@gmail.com:

Matúš Kukan has uploaded a new change for review.

Change subject: gbuild: also in libmerge case library needs to depend on all 
headers
..

gbuild: also in libmerge case library needs to depend on all headers

Change-Id: Ib1c3e37dfa6b9cd9708b721a7ad5b1bdb468b020
---
M solenv/gbuild/LinkTarget.mk
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/69/469/1
--
To view, visit https://gerrit.libreoffice.org/469
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1c3e37dfa6b9cd9708b721a7ad5b1bdb468b020
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com

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

Re: tail_build fail on missing includes

On 23 August 2012 23:48, Tomáš Chvátal tomas.chva...@gmail.com wrote:
 2012/8/23 Matúš Kukan matus.ku...@gmail.com:
 exactly, I was never sure I've done it right, but it seemed to be
 working so far.

 Matus

 Well to be honest I never had issue with it before the 3.6 release,
 but seems that with certain use options it became unstable.

 Should I disable it as whole (always experimental feature) or should I
 keep the live ebuild with it enabled in hope it gets fixed for 3.7?

Well, it should be fixed with (not tested at all)
https://gerrit.libreoffice.org/469

I'd push that to master but I don't have clean push-tree (It's handy,
I will get myself one later)
I think it's safe and fixes the problem and you can push it also to
3-6 or wherever.

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

[Libreoffice-commits] .: 2 commits - extras/source

 extras/source/shellnew/soffice.html |   12 
 extras/source/shellnew/soffice.odt  |binary
 2 files changed, 12 deletions(-)

New commits:
commit e155a555c97db9e3f54d7500f912fe88f634dc99
Author: Andras Timar ati...@suse.com
Date:   Fri Aug 24 00:18:05 2012 +0200

remove unused soffice.html

Change-Id: I877080c8fdc3dcd9a7018cfd3dd8d2cbec09dc8f

diff --git a/extras/source/shellnew/soffice.html 
b/extras/source/shellnew/soffice.html
deleted file mode 100644
index 71f9eb3..000
--- a/extras/source/shellnew/soffice.html
+++ /dev/null
@@ -1,12 +0,0 @@
-HTML
-HEAD
-   TITLE/TITLE
-  META NAME=GENERATOR CONTENT= 
-   META NAME=AUTHOR CONTENT= 
-  META NAME=CREATED CONTENT=19710731;14450130
-  META NAME=CHANGED CONTENT=01010101;0
-/HEAD
-FRAMESET COLS=100% FRAMEBORDER=YES
-   FRAME
-/FRAMESET
-/HTML
commit 9fceed463ba6ab752ef49f40e628a98e21cf525e
Author: Andras Timar ati...@suse.com
Date:   Fri Aug 24 00:16:50 2012 +0200

fdo#52978 remove hardcoded page width/height

Change-Id: I3af89440ce6305e24941b905c67d18b769b46a21

diff --git a/extras/source/shellnew/soffice.odt 
b/extras/source/shellnew/soffice.odt
index e79bb09..6b07475 100644
Binary files a/extras/source/shellnew/soffice.odt and 
b/extras/source/shellnew/soffice.odt differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Related fdo#53872: CRASH - opening database report