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

[Kohei Yoshida]

 sc/source/ui/optdlg/tpdefaults.cxx |   11 +++
 sc/source/ui/src/optdlg.src|4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 1817746ceb22329f0291acc5f6bb9c2a7d7a7fe4
Author: Andras Timar 
Date:   Wed Jan 18 23:48:43 2012 +0100

fdo#44896 accomodate localized text expansion

Signed-off-by: Kohei Yoshida 

diff --git a/sc/source/ui/optdlg/tpdefaults.cxx 
b/sc/source/ui/optdlg/tpdefaults.cxx
index bd1cc68..afced22 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -50,6 +50,17 @@ ScTpDefaultsOptions::ScTpDefaultsOptions(Window *pParent, 
const SfxItemSet &rCor
 rCoreAttrs.Get(GetWhich(SID_SCDOCOPTIONS)));
 mpLocalOptions.reset(new ScDocOptions(rItem.GetDocOptions()));
 
+long nTxtW = aFtNSheets.GetCtrlTextWidth( aFtNSheets.GetText() );
+long nCtrlW = aFtNSheets.GetSizePixel().Width();
+if ( nTxtW >= nCtrlW )
+{
+Size aNewSize = aFtNSheets.GetSizePixel();
+aNewSize.Width() += ( nTxtW - nCtrlW );
+aFtNSheets.SetSizePixel( aNewSize );
+Point aNewPoint = aEdNSheets.GetPosPixel();
+aNewPoint.X() += ( nTxtW - nCtrlW );
+aEdNSheets.SetPosPixel( aNewPoint );
+}
 aEdNSheets.SetModifyHdl( LINK(this, ScTpDefaultsOptions, NumModifiedHdl) );
 }
 
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index a8f82a5..8012628 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -926,14 +926,14 @@ TabPage RID_SCPAGE_DEFAULTS
 FixedText FT_NSHEETS
 {
 Pos = MAP_APPFONT ( 12 , 16 ) ;
-Size = MAP_APPFONT ( 120 , 8 ) ;
+Size = MAP_APPFONT ( 110 , 8 ) ;
 Text [ en-US ] = "Number of worksheets in new document";
 };
 NumericField ED_NSHEETS
 {
 HelpID = "sc:NumericField:RID_SCPAGE_CALC:ED_NSHEETS";
 Border = TRUE ;
-Pos = MAP_APPFONT ( 150 , 14 ) ;
+Pos = MAP_APPFONT ( 130 , 14 ) ;
 Size = MAP_APPFONT ( 25 , 12 ) ;
 Minimum = 1 ;
 Maximum = 32000 ;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 7 commits - basic/source editeng/source svl/source svtools/source tools/inc tools/source vcl/source

[Kohei Yoshida]

 basic/source/sbx/sbxvalue.cxx|   10 ++--
 editeng/source/items/bulitem.cxx |7 ++-
 editeng/source/items/frmitems.cxx|8 ++-
 svl/source/items/cintitem.cxx|8 +--
 svl/source/items/slstitm.cxx |6 +-
 svtools/source/filter/wmf/enhwmf.cxx |6 ++
 svtools/source/filter/wmf/winwmf.cxx |8 ++-
 svtools/source/graphic/grfattr.cxx   |   14 +-
 svtools/source/misc/transfer.cxx |   24 +++---
 tools/inc/tools/stream.hxx   |   14 +++---
 tools/source/generic/fract.cxx   |   13 -
 tools/source/generic/gen.cxx |   25 +--
 tools/source/generic/poly.cxx|   12 +++--
 tools/source/stream/stream.cxx   |   77 +++
 vcl/source/gdi/cvtsvm.cxx|   13 -
 vcl/source/gdi/hatch.cxx |8 ++-
 vcl/source/gdi/impgraph.cxx  |   44 ++--
 vcl/source/gdi/lineinfo.cxx  |   25 +++
 vcl/source/gdi/metaact.cxx   |   17 +--
 vcl/source/gdi/region.cxx|   20 +
 20 files changed, 230 insertions(+), 129 deletions(-)

New commits:
commit db7fb9cdf22d2e36e19baa3e78bca159b3f62735
Author: Keith McRae 
Date:   Wed Jan 18 16:21:17 2012 +

fdo#39428 Remove/audit SvStream operator>>/<<(long)

Replaced calls to operator>>(long) with operator>>(sal_Int32)
Replaced calls to operator<<(long) with sal::static_int_cast

diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index 2026ceb..c8ad028 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -514,8 +514,12 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
 rIStm.Read( (char*) &aCode, sizeof( aCode ) );  // Kennung
 rIStm >> nSize; // Size
 rIStm >> nVersion;  // Version
-rIStm >> aPrefSz.Width();   // PrefSize.Width()
-rIStm >> aPrefSz.Height();  // PrefSize.Height()
+//#fdo39428 SvStream no longer supports operator>>(long&)
+sal_Int32 nTmp32(0);
+rIStm >> nTmp32;
+aPrefSz.Width() = nTmp32;   // PrefSize.Width()
+rIStm >> nTmp32;
+aPrefSz.Height() = nTmp32;  // PrefSize.Height()
 
 // check header-magic and version
 if( rIStm.GetError()
@@ -1290,7 +1294,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
 case( GDI_TEXTLINE_COMMENT ):
 {
 Point   aStartPt;
-longnWidth;
+//#fdo39428 SvStream no longer supports operator>>(long&)
+sal_Int32  nWidth;
 sal_uInt32 nStrikeout;
 sal_uInt32 nUnderline;
 sal_Int32   nFollowingActionCount;
@@ -2367,7 +2372,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& 
rOStm, GDIMetaFile& rMtf,
 {
 const MetaTextLineAction*   pA = (MetaTextLineAction*) pAction;
 const Point&rStartPt = pA->GetStartPoint();
-const long  nWidth = pA->GetWidth();
+const sal_Int32 nWidth = (sal_Int32) 
pA->GetWidth();
 const FontStrikeout eStrikeout = pA->GetStrikeout();
 const FontUnderline eUnderline = pA->GetUnderline();
 sal_uLong   nOldPos, nNewPos;
diff --git a/vcl/source/gdi/hatch.cxx b/vcl/source/gdi/hatch.cxx
index 98d8ce3..7b8b682 100644
--- a/vcl/source/gdi/hatch.cxx
+++ b/vcl/source/gdi/hatch.cxx
@@ -184,9 +184,12 @@ SvStream& operator>>( SvStream& rIStm, ImplHatch& 
rImplHatch )
 {
 VersionCompat   aCompat( rIStm, STREAM_READ );
 sal_uInt16  nTmp16;
+sal_Int32   nTmp32(0);
 
 rIStm >> nTmp16; rImplHatch.meStyle = (HatchStyle) nTmp16;
-rIStm >> rImplHatch.maColor >> rImplHatch.mnDistance >> rImplHatch.mnAngle;
+//#fdo39428 SvStream no longer supports operator>>(long&)
+rIStm >> rImplHatch.maColor >> nTmp32 >> rImplHatch.mnAngle;
+rImplHatch.mnDistance = nTmp32;
 
 return rIStm;
 }
@@ -198,7 +201,8 @@ SvStream& operator<<( SvStream& rOStm, const ImplHatch& 
rImplHatch )
 VersionCompat aCompat( rOStm, STREAM_WRITE, 1 );
 
 rOStm << (sal_uInt16) rImplHatch.meStyle << rImplHatch.maColor;
-rOStm << rImplHatch.mnDistance << rImplHatch.mnAngle;
+//#fdo39428 SvStream no longer supports operator<<(long)
+rOStm << sal::static_int_cast(rImplHatch.mnDistance) << 
rImplHatch.mnAngle;
 
 return rOStm;
 }
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index e709034..6aaedd6 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -941,8 +941,9 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, 
sal_Bool bSwap )
 const sal_uLong nStartPos = rIStm.Tell();
  

[Libreoffice-commits] .: 2 commits - filter/source tools/inc tools/source unusedcode.easy writerperfect/source

[Kohei Yoshida]

 filter/source/svg/svgexport.cxx  |   55 ---
 filter/source/svg/svgfilter.hxx  |8 
 filter/source/svg/svgwriter.cxx  |8 
 tools/inc/tools/color.hxx|1 
 tools/source/generic/color.cxx   |   15 
 unusedcode.easy  |7 ---
 writerperfect/source/filter/PageSpan.cxx |   16 -
 writerperfect/source/filter/PageSpan.hxx |2 -
 8 files changed, 112 deletions(-)

New commits:
commit 3e04e08d371532960917afbcd59307fbd6c1f313
Author: Kohei Yoshida 
Date:   Wed Jan 18 19:59:13 2012 -0500

This method is now unused.

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index ea63fa1..905bd62 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -392,13 +392,6 @@ sal_Bool SVGExport::IsUseOpacity() const
 return bRet;
 }
 
-// 
-
-
-const ::basegfx::B2DPolyPolygon* SVGExport::getCurClip() const
-{
-return NULL;
-}
-
 // 
 // - ObjectRepresentation -
 // 
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index d218e06..68c19d4 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -143,8 +143,6 @@ public:
 sal_Bool IsUseNativeTextDecoration() const;
 sal_Bool IsUseOpacity() const;
 
-const ::basegfx::B2DPolyPolygon* getCurClip() const;
-
 protected:
 
 virtual void_ExportStyles( sal_Bool /* bUsed */ ) {}
commit 05a8ecca55d96b823348fa390482be6cfee64f69
Author: Marc-André Laverdière-Papineau 
Date:   Sun Jan 15 18:24:58 2012 -0500

removed some dead code

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 6149ddf..ea63fa1 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -382,20 +382,6 @@ sal_Bool SVGExport::IsUseNativeTextDecoration() const
 
 // 
-
 
-::rtl::OUString SVGExport::GetGlyphPlacement() const
-{
-::rtl::OUString aRet;
-
-if( mrFilterData.getLength() > 3 )
-mrFilterData[ 3 ].Value >>= aRet;
-else
-aRet = B2UCONST( "abs" );
-
-return aRet;
-}
-
-// 
-
-
 sal_Bool SVGExport::IsUseOpacity() const
 {
 sal_Bool bRet = !IsUseTinyProfile();
@@ -408,43 +394,9 @@ sal_Bool SVGExport::IsUseOpacity() const
 
 // 
-
 
-sal_Bool SVGExport::IsUseGradient() const
-{
-sal_Bool bRet = !IsUseTinyProfile();
-
-if( !bRet && ( mrFilterData.getLength() > 5 ) )
-mrFilterData[ 5 ].Value >>= bRet;
-
-return bRet;
-}
-
-// 
-
-
-void SVGExport::pushClip( const ::basegfx::B2DPolyPolygon& rPolyPoly )
-{
-maClipList.push_front( ::basegfx::tools::correctOrientations( rPolyPoly ) 
);
-}
-
-// 
-
-
-void SVGExport::popClip()
-{
-if( !maClipList.empty() )
-maClipList.pop_front();
-}
-
-// 
-
-
-sal_Bool SVGExport::hasClip() const
-{
-return( !maClipList.empty() );
-}
-
-// 
-
-
 const ::basegfx::B2DPolyPolygon* SVGExport::getCurClip() const
 {
-return( maClipList.empty() ? NULL : &( *maClipList.begin() ) );
+return NULL;
 }
 
 // 
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index 21c1238..d218e06 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -141,13 +141,8 @@ public:
 sal_Bool IsUseTinyProfile() const;
 sal_Bool IsEmbedFonts() const;
 sal_Bool IsUseNativeTextDecoration() const;
-::rtl::OUString GetGlyphPlacement() const;
 sal_Bool IsUseOpacity() const;
-sal_Bool IsUseGradient() const;
 
-void  pushClip( const ::basegfx::B2DPolyPolygon& rPolyPoly );
-void  popClip();
-sal_Bool  hasClip() const;
 const ::basegfx::B2DPolyPolygon* getCurClip() const;
 
 protected:
@@ -161,7 +156,6 @@ protected:
 private:
 
 const Sequence< PropertyValue >&mrFilterData;
-B2DPolyPolygonList  maClipList;
 
 SVGExport();
 };
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 9f70046..0639e5d 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -640,14 +640,6 @@ void SVGActionWriter::ImplWritePolyPolygon( const 
PolyPolygon& rPolyPoly, sal_Bo
 else
 aPolyPoly = rPolyPoly;
 
-if( mrExport.hasClip() )
-{
-const ::basegfx:

[Libreoffice-commits] .: sc/source

[Andras Timar]

 sc/source/ui/optdlg/tpdefaults.cxx |   11 +++
 sc/source/ui/src/optdlg.src|4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 225647779959d24cfdaea62968f518cc52533a90
Author: Andras Timar 
Date:   Wed Jan 18 23:48:43 2012 +0100

fdo#44896 accomodate localized text expansion

diff --git a/sc/source/ui/optdlg/tpdefaults.cxx 
b/sc/source/ui/optdlg/tpdefaults.cxx
index bd1cc68..afced22 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -50,6 +50,17 @@ ScTpDefaultsOptions::ScTpDefaultsOptions(Window *pParent, 
const SfxItemSet &rCor
 rCoreAttrs.Get(GetWhich(SID_SCDOCOPTIONS)));
 mpLocalOptions.reset(new ScDocOptions(rItem.GetDocOptions()));
 
+long nTxtW = aFtNSheets.GetCtrlTextWidth( aFtNSheets.GetText() );
+long nCtrlW = aFtNSheets.GetSizePixel().Width();
+if ( nTxtW >= nCtrlW )
+{
+Size aNewSize = aFtNSheets.GetSizePixel();
+aNewSize.Width() += ( nTxtW - nCtrlW );
+aFtNSheets.SetSizePixel( aNewSize );
+Point aNewPoint = aEdNSheets.GetPosPixel();
+aNewPoint.X() += ( nTxtW - nCtrlW );
+aEdNSheets.SetPosPixel( aNewPoint );
+}
 aEdNSheets.SetModifyHdl( LINK(this, ScTpDefaultsOptions, NumModifiedHdl) );
 }
 
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index a8f82a5..8012628 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -926,14 +926,14 @@ TabPage RID_SCPAGE_DEFAULTS
 FixedText FT_NSHEETS
 {
 Pos = MAP_APPFONT ( 12 , 16 ) ;
-Size = MAP_APPFONT ( 120 , 8 ) ;
+Size = MAP_APPFONT ( 110 , 8 ) ;
 Text [ en-US ] = "Number of worksheets in new document";
 };
 NumericField ED_NSHEETS
 {
 HelpID = "sc:NumericField:RID_SCPAGE_CALC:ED_NSHEETS";
 Border = TRUE ;
-Pos = MAP_APPFONT ( 150 , 14 ) ;
+Pos = MAP_APPFONT ( 130 , 14 ) ;
 Size = MAP_APPFONT ( 25 , 12 ) ;
 Minimum = 1 ;
 Maximum = 32000 ;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/source

[Thorsten Behrens]

 vcl/source/gdi/outdev2.cxx |  183 +
 1 file changed, 89 insertions(+), 94 deletions(-)

New commits:
commit 649457776f11de1f27157c98fd4b05432b425897
Author: Thorsten Behrens 
Date:   Wed Jan 18 18:09:39 2012 +0100

Unify blitting in vcl.

vcl's DrawBitmap methods have a very nice optimisation, that reduce
the blit to exactly the area covered (i.e. taking into account clip,
scale etc.). This was hand-coded, now moved out to own AdjustTwoRect
method, and also used from DrawOutDev / CopyArea.

diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index 329f5f4..2003de8 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -26,7 +26,6 @@
  *
  /
 
-
 #include 
 
 #include 
@@ -152,19 +151,69 @@ sal_uLong ImplAdjustTwoRect( TwoRect& rTwoRect, const 
Size& rSizePix )
 
 // ===
 
+void ImplAdjustTwoRect( TwoRect& rTwoRect, const Rectangle& rValidSrcRect )
+{
+if( ( rTwoRect.mnSrcX < rValidSrcRect.Left() ) || ( rTwoRect.mnSrcX >= 
rValidSrcRect.Right() ) ||
+( rTwoRect.mnSrcY < rValidSrcRect.Top() ) || ( rTwoRect.mnSrcY >= 
rValidSrcRect.Bottom() ) ||
+( ( rTwoRect.mnSrcX + rTwoRect.mnSrcWidth ) > rValidSrcRect.Right() ) 
||
+( ( rTwoRect.mnSrcY + rTwoRect.mnSrcHeight ) > rValidSrcRect.Bottom() 
) )
+{
+const Rectangle aSourceRect( Point( rTwoRect.mnSrcX, rTwoRect.mnSrcY ),
+ Size( rTwoRect.mnSrcWidth, 
rTwoRect.mnSrcHeight ) );
+Rectangle   aCropRect( aSourceRect );
+
+aCropRect.Intersection( rValidSrcRect );
+
+if( aCropRect.IsEmpty() )
+rTwoRect.mnSrcWidth = rTwoRect.mnSrcHeight = rTwoRect.mnDestWidth 
= rTwoRect.mnDestHeight = 0;
+else
+{
+const doublefFactorX = ( rTwoRect.mnSrcWidth > 1 ) ? (double) 
( rTwoRect.mnDestWidth - 1 ) / ( rTwoRect.mnSrcWidth - 1 ) : 0.0;
+const doublefFactorY = ( rTwoRect.mnSrcHeight > 1 ) ? (double) 
( rTwoRect.mnDestHeight - 1 ) / ( rTwoRect.mnSrcHeight - 1 ) : 0.0;
+
+const long nDstX1 = rTwoRect.mnDestX + FRound( fFactorX * ( 
aCropRect.Left() - rTwoRect.mnSrcX ) );
+const long nDstY1 = rTwoRect.mnDestY + FRound( fFactorY * ( 
aCropRect.Top() - rTwoRect.mnSrcY ) );
+const long nDstX2 = rTwoRect.mnDestX + FRound( fFactorX * ( 
aCropRect.Right() - rTwoRect.mnSrcX ) );
+const long nDstY2 = rTwoRect.mnDestY + FRound( fFactorY * ( 
aCropRect.Bottom() - rTwoRect.mnSrcY ) );
+
+rTwoRect.mnSrcX = aCropRect.Left();
+rTwoRect.mnSrcY = aCropRect.Top();
+rTwoRect.mnSrcWidth = aCropRect.GetWidth();
+rTwoRect.mnSrcHeight = aCropRect.GetHeight();
+rTwoRect.mnDestX = nDstX1;
+rTwoRect.mnDestY = nDstY1;
+rTwoRect.mnDestWidth = nDstX2 - nDstX1 + 1;
+rTwoRect.mnDestHeight = nDstY2 - nDstY1 + 1;
+}
+}
+}
+
+// ===
+
 void OutputDevice::ImplDrawOutDevDirect( const OutputDevice* pSrcDev, void* 
pVoidPosAry )
 {
 TwoRect*pPosAry = (TwoRect*)pVoidPosAry;
 SalGraphics*pGraphics2;
 
-if ( pPosAry->mnSrcWidth && pPosAry->mnSrcHeight && pPosAry->mnDestWidth 
&& pPosAry->mnDestHeight )
+if ( this == pSrcDev )
+pGraphics2 = NULL;
+else
 {
-if ( this == pSrcDev )
-pGraphics2 = NULL;
+if ( (GetOutDevType() != pSrcDev->GetOutDevType()) ||
+ (GetOutDevType() != OUTDEV_WINDOW) )
+{
+if ( !pSrcDev->mpGraphics )
+{
+if ( !((OutputDevice*)pSrcDev)->ImplGetGraphics() )
+return;
+}
+pGraphics2 = pSrcDev->mpGraphics;
+}
 else
 {
-if ( (GetOutDevType() != pSrcDev->GetOutDevType()) ||
- (GetOutDevType() != OUTDEV_WINDOW) )
+if ( ((Window*)this)->mpWindowImpl->mpFrameWindow == 
((Window*)pSrcDev)->mpWindowImpl->mpFrameWindow )
+pGraphics2 = NULL;
+else
 {
 if ( !pSrcDev->mpGraphics )
 {
@@ -172,68 +221,38 @@ void OutputDevice::ImplDrawOutDevDirect( const 
OutputDevice* pSrcDev, void* pVoi
 return;
 }
 pGraphics2 = pSrcDev->mpGraphics;
-}
-else
-{
-if ( ((Window*)this)->mpWindowImpl->mpFrameWindow == 
((Window*)pSrcDev)->mpWindowImpl->mpFrameWindow )
-pGraphics2 = NULL;
-else
-{
-if ( !pSrcDev->mpGraphics )
-{
-if ( !((OutputDevice*)pSrcDev)->ImplGetGraphics() )
-   

[Libreoffice-commits] .: svx/inc

[Kohei Yoshida]

 svx/inc/svx/svdograf.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a0a04bb926f37d68a127f3a1a88a612eba8a4776
Author: Kohei Yoshida 
Date:   Wed Jan 18 16:48:22 2012 -0500

Make them private instead of protected.

No classes derived from this and they are not virtual methods.

diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx
index 28f784d..f2d4ad8 100644
--- a/svx/inc/svx/svdograf.hxx
+++ b/svx/inc/svx/svdograf.hxx
@@ -93,7 +93,7 @@ private:
 friend class sdr::contact::ViewObjectContactOfGraphic;
 friend class SdrGraphicLink;
 
-protected:
+private:
 virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact();
 virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties();
 
@@ -114,7 +114,7 @@ protected:
 unsignedmbInsidePaint : 1;
 unsignedmbIsPreview   : 1;
 
-protected:
+private:
 
 voidImpLinkAnmeldung();
 voidImpLinkAbmeldung();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: svx/inc svx/source

[Kohei Yoshida]

 svx/inc/svx/svdograf.hxx   |3 ---
 svx/source/svdraw/svdograf.cxx |1 -
 2 files changed, 4 deletions(-)

New commits:
commit b5a2242ff6fd3136daec04a46d2780d425740398
Author: Kohei Yoshida 
Date:   Wed Jan 18 16:44:30 2012 -0500

This aCropRect data member is no longer used.

diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx
index 6aef6bd..28f784d 100644
--- a/svx/inc/svx/svdograf.hxx
+++ b/svx/inc/svx/svdograf.hxx
@@ -100,8 +100,6 @@ protected:
 voidImpSetAttrToGrafInfo(); // Werte vom Pool kopieren
 GraphicAttr aGrafInfo;
 
-Rectangle   aCropRect;  // Wenn aCropRect nicht Empty 
ist, dann enthaelt es den sichtbaren
-// Ausschnitt der Grafik in 
logischen Eingeiten der Grafik! Also Bitmap->=Pixel
 String  aFileName;  // Wenn es sich um einen Link 
handelt, steht hier der Dateiname drin.
 String  aFilterName;
 GraphicObject*  pGraphic;   // Zur Beschleunigung von 
Bitmapausgaben, besonders von gedrehten.
@@ -125,7 +123,6 @@ protected:
 DECL_LINK( ImpSwapHdl, GraphicObject* );
 
 public:
-
 TYPEINFO();
 
 SdrGrafObj();
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index c82b5fe..8686211 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -818,7 +818,6 @@ SdrGrafObj& SdrGrafObj::operator=( const SdrGrafObj& rObj )
 SdrRectObj::operator=( rObj );
 
 pGraphic->SetGraphic( rObj.GetGraphic(), &rObj.GetGraphicObject() );
-aCropRect = rObj.aCropRect;
 aFileName = rObj.aFileName;
 aFilterName = rObj.aFilterName;
 bMirrored = rObj.bMirrored;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - distro-configs/LibreOfficeiOS.conf solenv/bin

[Tor Lillqvist]

 distro-configs/LibreOfficeiOS.conf |1 +
 solenv/bin/makemani.pl |7 ---
 2 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 2605a9b5c00cc320f9a169dae96738834fea963e
Author: Tor Lillqvist 
Date:   Wed Jan 18 18:45:45 2012 +0200

Surely we want --disable-vba for iOS

diff --git a/distro-configs/LibreOfficeiOS.conf 
b/distro-configs/LibreOfficeiOS.conf
index d02cbb7..7a957bf 100644
--- a/distro-configs/LibreOfficeiOS.conf
+++ b/distro-configs/LibreOfficeiOS.conf
@@ -19,6 +19,7 @@
 --disable-randr
 --disable-randr-link
 --disable-systray
+--disable-vba
 --disable-xmlsec
 --without-afms
 --without-fonts
commit aaccb3dc49e83bf6a4d7d8cba5404a78f802ff8e
Author: Tor Lillqvist 
Date:   Wed Jan 18 11:51:13 2012 +0200

Don't print fairly pointless and verbose warning message

diff --git a/solenv/bin/makemani.pl b/solenv/bin/makemani.pl
index 7575d07..d3d9e2e 100644
--- a/solenv/bin/makemani.pl
+++ b/solenv/bin/makemani.pl
@@ -69,13 +69,6 @@ my $start_dir = $ARGV[1];
 my $dynamic_dir = $ARGV[2];
 my $out_dir = $ARGV[3];
 
-print "\n";
-print "#  #\n";
-print "# just a prototype - for testing purpose only! #\n";
-print "#  #\n";
-print "\n\n";
-
-
 # Traverse desired filesystems
 my $work_dir = cwd();
 chdir $start_dir or die "$0: ERROR - cannot change directory to 
\"$start_dir\"\n";
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - android/qa sal/inc sal/osl sal/Package_inc.mk sal/util tools/source

[Tor Lillqvist]

 android/qa/sc/Makefile  |8 -
 sal/Package_inc.mk  |1 
 sal/inc/osl/detail/file.h   |   87 +++
 sal/osl/unx/file.cxx|   77 +
 sal/osl/unx/file_stat.cxx   |   23 
 sal/osl/unx/uunxapi.cxx |   34 --
 sal/osl/unx/uunxapi.h   |6 +
 sal/osl/w32/file.cxx|   16 ++
 sal/util/sal.map|8 +
 tools/source/stream/strmunx.cxx |  226 
 10 files changed, 346 insertions(+), 140 deletions(-)

New commits:
commit fa83e46653536821fa70d37d9e4e0ed98538e522
Author: Tor Lillqvist 
Date:   Wed Jan 18 10:48:26 2012 +0200

No need to unpack the .res files any more

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index d023791..67fa567 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -137,11 +137,11 @@ copy-stuff:
sed -e 's!uri="./!uri="$(APP_DATA_PATH)/lib/!g' 
<$(SRC_ROOT)/testtools/$(INPATH)/lib/$$F.rdb >assets/lib/$$F.rdb; \
done
cp -R $(OUTDIR)/xml/registry assets/xml
-# Then assets that are unpacked at run-time into the app's data directory.
-   mkdir -p assets/unpack/bin
+# .res files
for F in $(OUTDIR)/bin/*.res; do \
-   cp $$F assets/unpack/bin; \
+   cp $$F assets/bin; \
done
+# Then assets that are unpacked at run-time into the app's data directory.
mkdir -p assets/unpack/etc/fonts
cp fonts.conf assets/unpack/etc/fonts
 #
@@ -164,7 +164,7 @@ uninstall:
adb uninstall $(APP_PACKAGE)
 
 run:
-   echo "STAR_RESOURCEPATH=$(APP_DATA_PATH)/bin 
FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf 
$(APP_DATA_PATH)/lib/libtest_sc_ucalc.so --headless --protector 
libunoexceptionprotector.so unoexceptionprotector 
'-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry' 
'-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb'  
'-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb  
file:///assets/ComponentTarget/framework/util/fwk.component 
file:///assets/ComponentTarget/i18npool/util/i18npool.component 
file:///assets/ComponentTarget/sfx2/util/sfx.component 
file:///assets/ComponentTarget/unoxml/source/service/unoxml.component 
file:///assets/ComponentTarget/configmgr/source/configmgr.component 
file:///assets/ComponentTarget/ucb/source/core/ucb1.component 
file:///assets/ComponentTarget/ucb/source/ucp/file/ucpfile1.component' 
-env:URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib 
-env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib" >cmdline
+   echo "STAR_RESOURCEPATH=/assets/bin 
FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf 
$(APP_DATA_PATH)/lib/libtest_sc_ucalc.so --headless --protector 
libunoexceptionprotector.so unoexceptionprotector 
'-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry' 
'-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb'  
'-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb  
file:///assets/ComponentTarget/framework/util/fwk.component 
file:///assets/ComponentTarget/i18npool/util/i18npool.component 
file:///assets/ComponentTarget/sfx2/util/sfx.component 
file:///assets/ComponentTarget/unoxml/source/service/unoxml.component 
file:///assets/ComponentTarget/configmgr/source/configmgr.component 
file:///assets/ComponentTarget/ucb/source/core/ucb1.component 
file:///assets/ComponentTarget/ucb/source/ucp/file/ucpfile1.component' 
-env:URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib 
-env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib" >cmdline
adb push cmdline $(APP_DATA_PATH)/cmdline
adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library 
libcppunittester -e lo-main-indirect-cmdline "$(APP_DATA_PATH)/cmdline"
 
commit e541105b45d5da8df29688394e3a0297a2e7
Author: Tor Lillqvist 
Date:   Tue Jan 17 21:59:22 2012 +0200

Use osl API to access files in the SvFileStream code

In general it's good to have file opening in just one place. In
particular, this means SvFileStream can now open files located in the
app package (.apk Zip archive) on Android, we don't need to unpack
them into separate files.

diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index ffb75a9..c9d4f07 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -46,6 +46,7 @@
 
 // class FileBase
 #include 
+#include 
 #include 
 #include 
 
@@ -88,7 +89,7 @@ InternalStreamLock::InternalStreamLock(
 {
 rtl::OString aFileName(rtl::OUStringToOString(m_pStream->GetFileName(),
 osl_getThreadTextEncoding()));
-stat( aFileName.getStr(), &m_aStat );
+osl_statFilePath( aFileName.getStr(), &m_aStat );
 LockList::get().push_back( this );
 #if OSL_DEBUG_LEVEL > 1
 fprintf( stderr, "locked %s", aFileName.getStr() );
@@ -127,7 +128,7 @@ sal_Bool InternalStreamLock::LockFile( sal_Size nStart, 
sal_Size nEnd, SvFileStr
 rtl::OString aFileName(rtl::OUStr

[Libreoffice-commits] .: basegfx/source basegfx/test

[Kohei Yoshida]

 basegfx/source/matrix/b2dhommatrix.cxx |8 
 basegfx/test/basegfx2d.cxx |   17 +
 2 files changed, 25 insertions(+)

New commits:
commit 800806ba850c7fd03e37acb011fa993e08cb8fc8
Author: Thorsten Behrens 
Date:   Wed Jan 18 14:52:20 2012 -0500

decompose() should return the original rotation angle and scales.

decompose() would return incorrect rotation angle and scales when the
angle was exactly 180 degrees, due to FPU rounding error.  This commit
fixes it.

This problem would manifest itself when inserting an image into
Calc/Draw, cropping it, and flipping it vertically or rotating it
at exactly 180 degrees.  Before the fix the image would simply disappear.

diff --git a/basegfx/source/matrix/b2dhommatrix.cxx 
b/basegfx/source/matrix/b2dhommatrix.cxx
index 942f313..8538d22 100644
--- a/basegfx/source/matrix/b2dhommatrix.cxx
+++ b/basegfx/source/matrix/b2dhommatrix.cxx
@@ -289,6 +289,14 @@ namespace basegfx
 // no rotation and shear, copy scale values
 rScale.setX(get(0, 0));
 rScale.setY(get(1, 1));
+
+// or is there?
+if( rScale.getX() < 0 && rScale.getY() < 0 )
+{
+// there is - 180 degree rotated
+rScale *= -1;
+rRotate = 180*F_PI180;
+}
 }
 else
 {
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index 65f778f..0f0c9c7 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -36,6 +36,7 @@
 #include "cppunit/extensions/HelperMacros.h"
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -666,6 +667,22 @@ public:
 CPPUNIT_ASSERT_MESSAGE("decompose: error test I2", 
impDecomposeComposeTest(-fSX, fSY, tan(-fS), -fR));
 CPPUNIT_ASSERT_MESSAGE("decompose: error test I3", 
impDecomposeComposeTest(fSX, -fSY, tan(-fS), -fR));
 CPPUNIT_ASSERT_MESSAGE("decompose: error test I4", 
impDecomposeComposeTest(-fSX, -fSY, tan(-fS), -fR));
+
+// cover special case of 180 degree rotation
+B2DHomMatrix aTest=tools::createScaleShearXRotateTranslateB2DHomMatrix(
+6425,3938,
+0,
+180*F_PI180,
+10482,4921);
+// decompose that matrix
+B2DTuple aDScale;
+B2DTuple aDTrans;
+double fDRot;
+double fDShX;
+aTest.decompose(aDScale, aDTrans, fDRot, fDShX);
+CPPUNIT_ASSERT_MESSAGE("decompose: error test J1", aDScale.getX() == 
6425 && aDScale.getY() == 3938);
+CPPUNIT_ASSERT_MESSAGE("decompose: error test J1", aDTrans.getX() == 
10482 && aDTrans.getY() == 4921);
+CPPUNIT_ASSERT_MESSAGE("decompose: error test J1", fDRot == 
180*F_PI180);
 }
 
 // Change the following lines only, if you add, remove or rename
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 basegfx/source/matrix/b2dhommatrix.cxx |8 
 basegfx/test/basegfx2d.cxx |   17 +
 2 files changed, 25 insertions(+)

New commits:
commit 9925d8023102d9b1c21da74faca829a61102da6a
Author: Thorsten Behrens 
Date:   Wed Jan 18 14:52:20 2012 -0500

decompose() should return the original rotation angle and scales.

decompose() would return incorrect rotation angle and scales when the
angle was exactly 180 degrees, due to FPU rounding error.  This commit
fixes it.

This problem would manifest itself when inserting an image into
Calc/Draw, cropping it, and flipping it vertically or rotating it
at exactly 180 degrees.  Before the fix the image would simply disappear.

diff --git a/basegfx/source/matrix/b2dhommatrix.cxx 
b/basegfx/source/matrix/b2dhommatrix.cxx
index adc9843..4ec49e9 100644
--- a/basegfx/source/matrix/b2dhommatrix.cxx
+++ b/basegfx/source/matrix/b2dhommatrix.cxx
@@ -320,6 +320,14 @@ namespace basegfx
 // no rotation and shear, copy scale values
 rScale.setX(get(0, 0));
 rScale.setY(get(1, 1));
+
+// or is there?
+if( rScale.getX() < 0 && rScale.getY() < 0 )
+{
+// there is - 180 degree rotated
+rScale *= -1;
+rRotate = 180*F_PI180;
+}
 }
 else
 {
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index d0251aa..005a9bb 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -36,6 +36,7 @@
 #include "cppunit/extensions/HelperMacros.h"
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -927,6 +928,22 @@ public:
 CPPUNIT_ASSERT_MESSAGE("decompose: error test I2", 
impDecomposeComposeTest(-fSX, fSY, tan(-fS), -fR));
 CPPUNIT_ASSERT_MESSAGE("decompose: error test I3", 
impDecomposeComposeTest(fSX, -fSY, tan(-fS), -fR));
 CPPUNIT_ASSERT_MESSAGE("decompose: error test I4", 
impDecomposeComposeTest(-fSX, -fSY, tan(-fS), -fR));
+
+// cover special case of 180 degree rotation
+B2DHomMatrix aTest=tools::createScaleShearXRotateTranslateB2DHomMatrix(
+6425,3938,
+0,
+180*F_PI180,
+10482,4921);
+// decompose that matrix
+B2DTuple aDScale;
+B2DTuple aDTrans;
+double fDRot;
+double fDShX;
+aTest.decompose(aDScale, aDTrans, fDRot, fDShX);
+CPPUNIT_ASSERT_MESSAGE("decompose: error test J1", aDScale.getX() == 
6425 && aDScale.getY() == 3938);
+CPPUNIT_ASSERT_MESSAGE("decompose: error test J1", aDTrans.getX() == 
10482 && aDTrans.getY() == 4921);
+CPPUNIT_ASSERT_MESSAGE("decompose: error test J1", fDRot == 
180*F_PI180);
 }
 
 // Change the following lines only, if you add, remove or rename
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - svl/inc svl/source svx/inc svx/source sw/inc sw/source toolkit/inc toolkit/source unusedcode.easy vcl/inc vcl/source

[Thomas Arnhold]

 svl/inc/svl/srchitem.hxx|3 
 svl/source/items/srchitem.cxx   |   64 --
 svx/inc/svx/ctredlin.hxx|6 -
 svx/inc/svx/simptabl.hxx|3 
 svx/inc/svx/unoshape.hxx|3 
 svx/source/dialog/_contdlg.cxx  |   44 
 svx/source/dialog/contimp.hxx   |3 
 svx/source/dialog/ctredlin.cxx  |   95 
 svx/source/dialog/simptabl.cxx  |   10 --
 svx/source/unodraw/unoshape.cxx |   16 
 sw/inc/pam.hxx  |4 -
 sw/source/core/crsr/pam.cxx |   10 --
 sw/source/core/text/inftxt.cxx  |   18 -
 sw/source/core/text/inftxt.hxx  |   18 -
 sw/source/core/text/porlay.hxx  |7 --
 sw/source/core/text/txtftn.cxx  |   10 --
 sw/source/core/text/txtio.cxx   |   47 -
 sw/source/ui/vba/vbacolumn.cxx  |   55 
 sw/source/ui/vba/vbacolumn.hxx  |4 -
 sw/source/ui/vba/vbastyle.cxx   |   27 ---
 sw/source/ui/vba/vbastyle.hxx   |1 
 toolkit/inc/toolkit/helper/vclunohelper.hxx |1 
 toolkit/source/helper/vclunohelper.cxx  |   70 
 unusedcode.easy |   34 --
 vcl/inc/vcl/window.hxx  |3 
 vcl/source/window/window.cxx|7 --
 26 files changed, 1 insertion(+), 562 deletions(-)

New commits:
commit 105546f7f11ccee50f8066bfb7c753fabb177fc8
Author: Thomas Arnhold 
Date:   Wed Jan 18 19:48:19 2012 +0100

remove unused code

diff --git a/svl/inc/svl/srchitem.hxx b/svl/inc/svl/srchitem.hxx
index 7a0be71..c832bac 100644
--- a/svl/inc/svl/srchitem.hxx
+++ b/svl/inc/svl/srchitem.hxx
@@ -171,9 +171,6 @@ public:
 inline  sal_uInt16  GetLEVLonger() const;
 inline  voidSetLEVLonger(sal_uInt16 nSet);
 
-voidGetFromDescriptor( const 
::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & 
rDescr );
-voidSetToDescriptor( ::com::sun::star::uno::Reference< 
::com::sun::star::util::XSearchDescriptor > & rDescr );
-
 inline const com::sun::star::util::SearchOptions &
 GetSearchOptions() const;
 inline void SetSearchOptions( const com::sun::star::util::SearchOptions 
&rOpt );
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 0e01172..57f1f1d 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -280,70 +280,6 @@ SfxItemPresentation SvxSearchItem::GetPresentation
 return SFX_ITEM_PRESENTATION_NONE;
 }
 
-void SvxSearchItem::GetFromDescriptor( const ::com::sun::star::uno::Reference< 
::com::sun::star::util::XSearchDescriptor >& rDescr )
-{
-SetSearchString( rDescr->getSearchString() );
-::com::sun::star::uno::Any aAny = rDescr->getPropertyValue( 
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchWords") ) );
-sal_Bool bTemp = false;
-aAny >>= bTemp ;
-SetWordOnly( bTemp );
-aAny = rDescr->getPropertyValue( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("SearchCaseSensitive") ) );
-aAny >>= bTemp ;
-SetExact( bTemp );
-aAny = rDescr->getPropertyValue( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("SearchBackwards") ) );
-aAny >>= bTemp ;
-SetBackward( bTemp );
-aAny = rDescr->getPropertyValue( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("SearchInSelection") ) );
-aAny >>= bTemp ;
-SetSelection( bTemp );
-aAny = rDescr->getPropertyValue( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("SearchRegularExpression") ) );
-aAny >>= bTemp ;
-SetRegExp( bTemp );
-aAny = rDescr->getPropertyValue( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("SearchSimilarity") ) );
-aAny >>= bTemp ;
-SetLevenshtein( bTemp );
-aAny = rDescr->getPropertyValue( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityRelax") ) );
-aAny >>= bTemp ;
-SetLEVRelaxed( bTemp );
-aAny = rDescr->getPropertyValue( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityExchange") ) );
-sal_Int16 nTemp = 0;
-aAny >>= nTemp ;
-SetLEVOther( nTemp );
-aAny = rDescr->getPropertyValue( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityRemove") ) );
-aAny >>= nTemp ;
-SetLEVShorter( nTemp );
-aAny = rDescr->getPropertyValue( ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityAdd") ) );
-aAny >>= nTemp ;
-SetLEVLonger( nTemp );
-}
-
-void SvxSearchItem::SetToDescriptor( ::com::sun::star::uno::Reference< 
::com::sun::star::util::XSearchDescriptor > & rDescr )
-{
-rDescr->setSearchString( GetSearchString() );
-::com::sun::star::uno::Any aAny;
-aAny <<= GetWordOnly() ;
-rDescr->setPropertyValue( ::rtl::OUString( 
RTL_CONSTASCII_USTR

[Libreoffice-commits] .: extensions/source svx/inc

[Ivan Timofeev]

 extensions/source/bibliography/bib.hrc |1 
 svx/inc/globlmn_tmpl.hrc   |  721 -
 2 files changed, 722 deletions(-)

New commits:
commit bb921f1df6bb12671777e3f3e4a8caa6f7791c3d
Author: Ivan Timofeev 
Date:   Wed Jan 18 23:23:05 2012 +0400

svx: remove unused definitions in globlmn_tmpl.hrc

diff --git a/extensions/source/bibliography/bib.hrc 
b/extensions/source/bibliography/bib.hrc
index 480a820..9ca5f3d 100644
--- a/extensions/source/bibliography/bib.hrc
+++ b/extensions/source/bibliography/bib.hrc
@@ -62,7 +62,6 @@
 #define RID_MAIN_ME_DBSOURCE(RID_BIB_MENU +10)
 #define RID_MAIN_DELETE_RECORD  (RID_BIB_MENU +11)
 #define RID_MAIN_INSERT_RECORD  (RID_BIB_MENU +12)
-#define MN_TEMPLATES(RID_BIB_MENU +13)  // to make makro 
ITEM_FILE_DOCTEMPLATE happy...
 
 #define RID_POPUP_ME_VIEW   (RID_BIB_MENU +50)
 
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index 632a4c5..f6b8f73 100755
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -50,21 +50,6 @@
 Command = ".uno:ChangeControlType" ; \
 Text [ en-US ] = "~Replace with";   \
 
-#define ITEM_FORMAT_TEMPLATECATALOG \
-Identifier = SID_STYLE_CATALOG ; \
-Command = ".uno:StyleCatalog" ; \
-Text [ en-US ] = "~Catalog..." ; \
-
-#define ITEM_FORMAT_TEMPLATE \
-Identifier = SID_STYLE_DESIGNER ; \
-Command = ".uno:DesignerDialog" ; \
-Text [ en-US ] = "St~ylist" ; \
-
-#define ITEM_FORMAT_AUTOFORMAT \
-Identifier = SID_AUTOFORMAT ; \
-Command = ".uno:AutoFormat" ; \
-Text [ en-US ] = "Auto~Format..." ;\
-
 #define ITEM_FORMAT_CHAR_DLG \
 Identifier = SID_CHAR_DLG ; \
 Command = ".uno:FontDialog" ; \
@@ -261,394 +246,22 @@
 Command = ".uno:ToggleObjectBezierMode" ; \
 Text [ en-US ] = "Edit ~Points" ;\
 
-#define ITEM_FILE_PICKLIST \
-Identifier = SID_PICKLIST ; \
-Command = ".uno:PickList" ; \
-Text [ en-US ] = "~File" ;  \
-
-#define ITEM_FILE_NEWDOC \
-Identifier = SID_NEWDOCDIRECT ; \
-Command = ".uno:AddDirect" ; \
-Text [ en-US ] = "~New" ;\
-
-#define ITEM_FILE_OPENDOC \
-Identifier = SID_OPENDOC ; \
-Command = ".uno:Open" ; \
-Text [ en-US ] = "~Open..." ;\
-
-
-#define ITEM_FILE_AUTOPILOT \
-MenuItem\
-{\
-Identifier = SID_AUTOPILOTMENU ; \
-Command = ".uno:AutoPilotMenu" ; \
-Text [ en-US ] = "A~utoPilot" ; \
-};
-
-#define ITEM_FILE_CLOSEDOC \
-Identifier = SID_CLOSEDOC ; \
-Command = ".uno:CloseDoc" ; \
-Text [ en-US ] = "~Close" ;\
-
-#define ITEM_FILE_SAVEDOC \
-Identifier = SID_SAVEDOC ; \
-Command = ".uno:Save" ; \
-Text [ en-US ] = "~Save" ;  \
-
-#define ITEM_FILE_SAVEDOCS \
-Identifier = SID_SAVEDOCS ; \
-Command = ".uno:SaveAll" ; \
-Text [ en-US ] = "Sa~ve All" ; \
-
-#define ITEM_FILE_SAVEASDOC \
-Identifier = SID_SAVEASDOC ; \
-Command = ".uno:SaveAs" ; \
-Text [ en-US ] = "Save ~As..." ;\
-
-#define ITEM_FILE_EXPORTDOC \
-Identifier = SID_EXPORTDOC ; \
-Command = ".uno:ExportTo" ; \
-Text [ en-US ] = "Expor~t..." ;   \
-
-#define ITEM_FILE_EXPORTDOCASPDF \
-Identifier = SID_EXPORTDOCASPDF ; \
-Command = ".uno:ExportToPDF" ; \
-Text [ en-US ] = "Export as P~DF..." ;  \
-
-#define ITEM_FILE_VERSIONDIALOG \
-Identifier = SID_VERSION ; \
-Command = ".uno:VersionDialog" ; \
-Text [ en-US ] = "Versions..." ; \
-
-#define ITEM_FILE_LASTVERSIONDOC \
-Identifier = SID_RELOAD ; \
-Command = ".uno:Reload" ; \
-Text [ en-US ] = "Reload" ;\
-
-#define ITEM_FILE_DOCINFO \
-Identifier = SID_DOCINFO ; \
-Command = ".uno:SetDocumentProperties" ; \
-Text [ en-US ] = "Propert~ies..." ;\
-
-#define ITEM_FILE_DOCTEMPLATE \
-Identifier = MN_TEMPLATES;  \
-Command = ".uno:TemplateMenu" ; \
-Text [ en-US ] = "~Templates" ;\
-SubMenu = Menu  \
-{   \
-ItemList =  \
-{   \
-MenuItem\
-{   \
-Identifier = SID_ORGANIZER ; \
-Command = ".uno:Organizer" ; \
-Text [ en-US ] = "~Organize...";\
-};  \
-MenuItem\
-{   \
-Identifier = SID_TEMPLATE_ADDRESSBOKSOURCE; \
-Command = ".uno:AddressBookSource" ; \
-Text [ en-US ] = "~Address Book Source..."; \
-};  \
-MenuItem\
-{   \
-Identifier = SID_DOCTEMPLATE ;  \
-Command = ".uno:SaveAsTemplate" ;   \
-Text [ en-US ] = "~Save...";\
-};  \

[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk desktop/Module_desktop.mk desktop/util desktop/WinResTarget_sofficebin.mk desktop/WinResTarget_soffice.mk officecfg/registry reportbuilder/re

[Andras Timar]

 desktop/Executable_soffice.bin.mk  
  |2 
 desktop/Module_desktop.mk  
  |1 
 desktop/WinResTarget_soffice.mk
  |2 
 desktop/WinResTarget_sofficebin.mk 
  |   49 ++
 desktop/util/officeloader.rc   
  |   36 +--
 officecfg/registry/data/org/openoffice/Setup.xcu   
  |   22 ++--
 reportbuilder/registry/data/org/openoffice/Setup.xcu   
  |2 
 scp2/inc/macros.inc
  |2 
 scp2/source/base/registryitem_base.scp 
  |2 
 scp2/source/binfilter/registryitem_binfilter.scp   
  |   16 +--
 scp2/source/calc/registryitem_calc.scp 
  |   26 ++---
 scp2/source/draw/registryitem_draw.scp 
  |   12 +-
 scp2/source/impress/registryitem_impress.scp   
  |   28 ++---
 scp2/source/math/registryitem_math.scp 
  |8 -
 scp2/source/ooo/registryitem_ooo.scp   
  |4 
 scp2/source/writer/registryitem_writer.scp 
  |   32 +++---
 
setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
 |   17 +--
 
setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
 |1 
 setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx  
  |4 
 sfx2/source/appl/shutdowniconunx.cxx   
  |6 -
 sfx2/source/appl/shutdowniconw32.cxx   
  |   18 +--
 vcl/inc/svids.hrc  
  |8 -
 vcl/inc/vcl/syswin.hxx 
  |   16 +--
 vcl/unx/generic/window/salframe.cxx
  |2 
 24 files changed, 166 insertions(+), 150 deletions(-)

New commits:
commit ceb14e0143fb72b34421f6fb81ff1fb1842cb500
Author: Andras Timar 
Date:   Wed Jan 18 13:11:11 2012 +0100

fdo#37740 remove duplicate icons from soffice.bin/soffice.exe

diff --git a/desktop/Executable_soffice.bin.mk 
b/desktop/Executable_soffice.bin.mk
index 8815432..00fb005 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -103,6 +103,6 @@ $(eval $(call gb_Executable_set_ldflags,\
 
 endif
 
-$(eval $(call gb_Executable_add_nativeres,$(sofficebin),soffice/src)) 
+$(eval $(call gb_Executable_add_nativeres,$(sofficebin),sofficebin/src))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 3d0045c..eb83f82 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -98,6 +98,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
 WinResTarget_sdraw \
 WinResTarget_simpress \
 WinResTarget_soffice \
+WinResTarget_sofficebin \
 WinResTarget_smath \
 WinResTarget_sweb \
 WinResTarget_swriter \
diff --git a/desktop/WinResTarget_soffice.mk b/desktop/WinResTarget_soffice.mk
index b15..fe66aa5 100644
--- a/desktop/WinResTarget_soffice.mk
+++ b/desktop/WinResTarget_soffice.mk
@@ -44,6 +44,6 @@ $(eval $(call gb_WinResTarget_add_dependency,soffice/src,\
 sysui/desktop/icons/main_app.ico \
 ))
 
-$(eval $(call gb_WinResTarget_add_file,soffice/src,desktop/util/officeloader))
+$(eval $(call 
gb_WinResTarget_add_file,soffice/src,desktop/win32/source/applauncher/launcher))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_sofficebin.mk 
b/desktop/WinResTarget_sofficebin.mk
new file mode 100644
index 000..334c9b7
--- /dev/null
+++ b/desktop/WinResTarget_sofficebin.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., David Tardon 
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the conten

[Libreoffice-commits] .: sw/source

[Takeshi Abe]

 sw/source/filter/xml/ForbiddenCharactersEnum.hxx |   44 ---
 sw/source/filter/xml/xmlexp.cxx  |1 
 sw/source/filter/xml/xmlimp.cxx  |1 
 3 files changed, 46 deletions(-)

New commits:
commit 15e35093e86b49b3e8129108fa358adc0c865fbe
Author: Takeshi Abe 
Date:   Thu Jan 19 02:25:23 2012 +0900

removed unused header

diff --git a/sw/source/filter/xml/ForbiddenCharactersEnum.hxx 
b/sw/source/filter/xml/ForbiddenCharactersEnum.hxx
deleted file mode 100644
index 374d705..000
--- a/sw/source/filter/xml/ForbiddenCharactersEnum.hxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- /
-
-#ifndef _FORBIDDEN_CHARACTERS_ENUM_HXX
-#define _FORBIDDEN_CHARACTERS_ENUM_HXX
-
-enum ForbiddenCharactersEnum
-{
-SW_FORBIDDEN_CHARACTER_LANGUAGE,
-SW_FORBIDDEN_CHARACTER_COUNTRY,
-SW_FORBIDDEN_CHARACTER_VARIANT,
-SW_FORBIDDEN_CHARACTER_BEGIN_LINE,
-SW_FORBIDDEN_CHARACTER_END_LINE,
-SW_FORBIDDEN_CHARACTER_MAX
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 7d6d0e9..9faf522 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -63,7 +63,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 // for locking SolarMutex: svapp + mutex
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 36643e4..a59ebf7 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -58,7 +58,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: android/qa configure.in vcl/headless

[Michael Meeks]

 android/qa/sc/Makefile  |   12 +---
 android/qa/simple/Makefile  |   20 +++-
 configure.in|1 +
 vcl/headless/svpdummies.cxx |6 ++
 4 files changed, 15 insertions(+), 24 deletions(-)

New commits:
commit 3c9264558e120e9aa0a7bf7e86df14d51b900b42
Author: Michael Meeks 
Date:   Wed Jan 18 17:16:26 2012 +

android: use config_host.mk for unit test goodness

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 22d4eba..d023791 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -1,3 +1,5 @@
+include ../../../config_host.mk
+
 # The package of this app
 APP_PACKAGE=org.libreoffice.android.qa.sc
 
@@ -9,15 +11,11 @@ BOOTSTRAP=org.libreoffice.android.Bootstrap
 
 APP_DATA_PATH=/data/data/$(APP_PACKAGE)
 
-NDK_HOME:=$(shell type -p ndk-build)
-NDK_HOME:=$(shell dirname $(NDK_HOME))
-
 SODEST=libs/armeabi-v7a
 OBJLOCAL=obj/local/armeabi-v7a
 
 define COPY
-cp $(1) $(SODEST)$(if $(2),/$(2)) && \
-arm-linux-androideabi-strip --strip-debug $(SODEST)$(if $(2),/$(2),/$(notdir 
$(1))) && \
+cp $(1) $(SODEST)$(if $(2),/$(2)) && $(STRIP) --strip-debug $(SODEST)$(if 
$(2),/$(2),/$(notdir $(1))) && \
 cp $(1) $(OBJLOCAL)$(if $(2),/$(2))
 endef
 
@@ -118,7 +116,7 @@ copy-stuff:
done
 #
 # Then the shared GNU C++ library
-   $(call 
COPY,$(NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so)
+   $(call 
COPY,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so)
 #
 # Then other "assets" that can be left in the .apk. Let the directory
 # structure under assets mimic that under solver or workdir for now.
@@ -149,7 +147,7 @@ copy-stuff:
 #
 # Then gdbserver and gdb.setup so that we can debug with ndk-gdb.
 #
-   cp 
$(NDK_HOME)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver $(SODEST)
+   cp 
$(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver 
$(SODEST)
echo set solib-search-path ./obj/local/armeabi-v7a >$(SODEST)/gdb.setup
 
 
diff --git a/android/qa/simple/Makefile b/android/qa/simple/Makefile
index a98250b..70fb5c6 100644
--- a/android/qa/simple/Makefile
+++ b/android/qa/simple/Makefile
@@ -1,3 +1,5 @@
+include ../../../config_host.mk
+
 # The package of this app
 APP_PACKAGE=org.libreoffice.android.qa
 
@@ -9,15 +11,11 @@ BOOTSTRAP=org.libreoffice.android.Bootstrap
 
 APP_DATA_PATH=/data/data/$(APP_PACKAGE)
 
-NDK_HOME:=$(shell type -p ndk-build)
-NDK_HOME:=$(shell dirname $(NDK_HOME))
-
 SODEST=libs/armeabi-v7a
 OBJLOCAL=obj/local/armeabi-v7a
 
 define COPY
-cp $(1) $(SODEST)$(if $(2),/$(2)) && \
-arm-linux-androideabi-strip --strip-debug $(SODEST)$(if $(2),/$(2),/$(notdir 
$(1))) && \
+cp $(1) $(SODEST)$(if $(2),/$(2)) && $(STRIP) --strip-debug $(SODEST)$(if 
$(2),/$(2),/$(notdir $(1))) && \
 cp $(1) $(OBJLOCAL)$(if $(2),/$(2))
 endef
 
@@ -47,17 +45,13 @@ copy-stuff:
 #
 # cppunit "plug-ins", first ones from sal
 #
-   $(call COPY,$(SRCDIR)/sal/$(INPATH)/lib/*.so)
+   $(call COPY,$(OUTDIR)/lib/libuno_sal*.so)
 #
 # and ones from other modules. Note that depending on when you try
 # this, these might not have been built yet.
 #
-   for F in $(SRC_ROOT)/cppu/$(INPATH)/lib/qa_*.so; do \
-   $(call COPY,$${F},`basename $${F}`); \
-   done
-#
-   for F in i18npool_test_breakiterator; do \
-   $(call COPY,$(WORKDIR)/LinkTarget/CppunitTest/libtest_$${F}.so); \
+   for F in i18npool_test_breakiterator cppu cppuhelper sal; do \
+   $(call COPY,$(WORKDIR)/LinkTarget/CppunitTest/libtest_$${F}*.so); \
done
 #
 # Other "programs"
@@ -90,7 +84,7 @@ copy-stuff:
done
 #
 # Then the shared GNU C++ library
-   $(call 
COPY,$(NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so)
+   $(call 
COPY,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so)
 #
 # bridgetest components, not in solver
for F in bridgetest constructors cppobj; do \
diff --git a/configure.in b/configure.in
index 638a0fd..24d6652 100644
--- a/configure.in
+++ b/configure.in
@@ -104,6 +104,7 @@ if test "z$with_android_ndk" != "z"; then
test -z "$STRIP" && 
STRIP=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-strip
test -z "$CC" && CC="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-gcc 
--sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm  
-L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a"
test -z "$CXX" && CXX="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-g++ 
--sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm -I 
$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include 
-I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include 
-L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions 
-frtti"
+#   PATH="$ANDROID_NDK_HOME/:$PATH"
 fi
 AC_SUBST(ANDROID_NDK_HOME)
 
diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx
index 

[Libreoffice-commits] .: 9 commits - sc/CppunitTest_sc_datapilotdescriptorbase.mk sc/Module_sc.mk sc/qa

[Markus Mohrhard]

 sc/CppunitTest_sc_datapilotdescriptorbase.mk |9 
 sc/Module_sc.mk  |1 
 sc/qa/extras/cellproperties.cxx  |   36 +++
 sc/qa/extras/tableautoformatfield.cxx|   27 ++
 sc/qa/extras/testdocuments/rangenamessrc.ods |binary
 sc/qa/extras/xcellrangesquery.cxx|   37 ++-
 sc/qa/extras/xdatabaserange.cxx  |   38 +++
 sc/qa/extras/xdatapilottable.cxx |6 
 sc/qa/extras/xspreadsheets2.cxx  |  274 ---
 9 files changed, 344 insertions(+), 84 deletions(-)

New commits:
commit e3e54d74d6b9d8f5f2c256741fbaade69f4f0318
Author: Markus Mohrhard 
Date:   Wed Jan 18 18:11:13 2012 +0100

enable new datapilot api test

diff --git a/sc/CppunitTest_sc_datapilotdescriptorbase.mk 
b/sc/CppunitTest_sc_datapilotdescriptorbase.mk
index 954cd6d..16e5cd9 100644
--- a/sc/CppunitTest_sc_datapilotdescriptorbase.mk
+++ b/sc/CppunitTest_sc_datapilotdescriptorbase.mk
@@ -115,17 +115,14 @@ $(eval $(call 
gb_CppunitTest_add_components,sc_datapilotdescriptorbase,\
 sot/util/sot \
 svl/source/fsstor/fsstorage \
 toolkit/util/tk \
+ucb/source/core/ucb1 \
+ucb/source/ucp/file/ucpfile1 \
+ucb/source/ucp/tdoc/ucptdoc1 \
 unotools/util/utl \
 unoxml/source/rdf/unordf \
 unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_add_old_components,sc_datapilotdescriptorbase,\
-ucb1 \
-ucpfile1 \
-ucptdoc1 \
-))
-
 $(eval $(call gb_CppunitTest_set_args,sc_datapilotdescriptorbase,\
 --headless \
 --protector unoexceptionprotector$(gb_Library_DLLEXT) 
unoexceptionprotector \
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index e57a433..266f822 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Module_add_check_targets,sc,\
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
 CppunitTest_sc_cellrangesbase \
+CppunitTest_sc_datapilotdescriptorbase \
 CppunitTest_sc_datapilotfieldobj \
 CppunitTest_sc_macros_test \
 CppunitTest_sc_namedrangeobj \
commit 5f1acc94095849f76a1ccd9711c2a4b524ca7d50
Author: Markus Mohrhard 
Date:   Wed Jan 18 18:00:55 2012 +0100

little clean-up in xspreadsheet2 test

diff --git a/sc/qa/extras/xspreadsheets2.cxx b/sc/qa/extras/xspreadsheets2.cxx
index 2c79d8e..f694556 100644
--- a/sc/qa/extras/xspreadsheets2.cxx
+++ b/sc/qa/extras/xspreadsheets2.cxx
@@ -67,11 +67,6 @@ public:
 virtual void setUp();
 virtual void tearDown();
 
-uno::Reference< sheet::XSpreadsheetDocument> getDoc(const rtl::OUString, 
uno::Reference< lang::XComponent >);
-uno::Reference< sheet::XNamedRanges> getNamedRanges(uno::Reference< 
sheet::XSpreadsheetDocument >);
-void importSheetToCopy();
-bool isExternalReference(const rtl::OUString aDestContent, const 
rtl::OUString aSrcContent );
-
 // XSpreadsheets2
 void testImportedSheetNameAndIndex();
 void testImportString();
@@ -99,6 +94,11 @@ public:
 CPPUNIT_TEST_SUITE_END();
 
 private:
+uno::Reference< sheet::XSpreadsheetDocument> getDoc(const rtl::OUString, 
uno::Reference< lang::XComponent >&);
+uno::Reference< sheet::XNamedRanges> getNamedRanges(uno::Reference< 
sheet::XSpreadsheetDocument >);
+void importSheetToCopy();
+bool isExternalReference(const rtl::OUString aDestContent, const 
rtl::OUString aSrcContent );
+
 static int nTest;
 static uno::Reference< lang::XComponent > xComponent;
 
@@ -132,7 +132,7 @@ rtl::OUString 
ScXSpreadsheets2::aSrcSheetName(RTL_CONSTASCII_USTRINGPARAM("Sheet
 rtl::OUString 
ScXSpreadsheets2::aSrcFileBase(RTL_CONSTASCII_USTRINGPARAM("rangenamessrc.ods"));
 rtl::OUString 
ScXSpreadsheets2::aDestFileBase(RTL_CONSTASCII_USTRINGPARAM("rangenames.ods"));
 sal_Int32 ScXSpreadsheets2::nDestPos = 0;
-sal_Int32 ScXSpreadsheets2::nDestPosEffective;
+sal_Int32 ScXSpreadsheets2::nDestPosEffective = 0;
 
 void ScXSpreadsheets2::testImportedSheetNameAndIndex()
 {
@@ -352,7 +352,7 @@ void ScXSpreadsheets2::testImportCellStyle()
 CPPUNIT_ASSERT_MESSAGE("New style: VertJustify not set", aVertJustify == 
table::CellVertJustify_CENTER);
 }
 
-uno::Reference< sheet::XSpreadsheetDocument> ScXSpreadsheets2::getDoc(const 
rtl::OUString aFileBase, uno::Reference< lang::XComponent > xComp)
+uno::Reference< sheet::XSpreadsheetDocument> ScXSpreadsheets2::getDoc(const 
rtl::OUString aFileBase, uno::Reference< lang::XComponent >& xComp)
 {
 rtl::OUString aFileURL;
 createFileURL(aFileBase, aFileURL);
@@ -401,11 +401,6 @@ void ScXSpreadsheets2::importSheetToCopy()
 xDestSheet = uno::Reference< sheet::XSpreadsheet > ( 
xDestSheetNameAccess->getByName(aSrcSheetName), UNO_QUERY_THROW);
 
 bIsSheetImported = true;
-
-// store destFile
-//uno::Reference< frame::XStorable > xStore (xDestDoc, 
UNO_QUERY_THROW);
-//xStore->store();
-
 }
 }
 
@@ -413,13 +408,7 @@ bool ScXSpreadsheets2::isExternalReference(rtl::OUString 
aDestContent, rtl

[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.in README.cross vcl/android vcl/headless vcl/inc vcl/Library_vcl.mk

[Michael Meeks]

 README.cross|   18 
 config_host.mk.in   |1 
 configure.in|   23 +++
 vcl/Library_vcl.mk  |2 
 vcl/android/androidinst.cxx |   82 
 vcl/headless/svpdummies.cxx |8 +--
 vcl/inc/android/androidinst.hxx |   46 ++
 vcl/inc/generic/gendata.hxx |3 -
 vcl/inc/headless/svpdummies.hxx |   15 +++
 9 files changed, 168 insertions(+), 30 deletions(-)

New commits:
commit 453339cc22da7b350804bd1911faa99b89815c5b
Author: Michael Meeks 
Date:   Wed Jan 18 17:07:07 2012 +

android: add --with-android-ndk= option to simplify configure.

diff --git a/README.cross b/README.cross
index d5ad353..4a74799 100644
--- a/README.cross
+++ b/README.cross
@@ -324,16 +324,9 @@ insane.)
 
 Here is my autogen.lastrun for Android, when cross-compiling from Mac OS X:
 
-SYSBASE=/Users/tml/android-ndk-r7/platforms/android-9/arch-arm
-CC=ccache 
/Users/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/bin/arm-linux-androideabi-gcc
 -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -Wl,--fix-cortex-a8 
--sysroot /Users/tml/android-ndk-r7/platforms/android-9/arch-arm 
-L/Users/tml/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a
-CXX=ccache 
/Users/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/bin/arm-linux-androideabi-g++
 -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -Wl,--fix-cortex-a8 
--sysroot /Users/tml/android-ndk-r7/platforms/android-9/arch-arm -I 
/Users/tml/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/include 
-I/Users/tml/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include
 -L/Users/tml/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a 
-fexceptions -frtti
-AR=/Users/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/bin/arm-linux-androideabi-ar
-NM=/Users/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/bin/arm-linux-androideabi-nm
-OBJDUMP=/Users/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/bin/arm-linux-androideabi-objdump
-RANLIB=/Users/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/bin/arm-linux-androideabi-ranlib
-STRIP=/Users/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/bin/arm-linux-androideabi-strip
 CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4
 CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4
+--with-android-ndk=/Users/tml/android-ndk-r7
 --build=x86_64-apple-darwin11
 --disable-zenity
 --enable-werror
@@ -346,16 +339,9 @@ CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 
-mmacosx-version-min=10.4
 
 And here is my autogen.lastrun for Android when cross-compiling from Linux:
 
-SYSBASE=/home/tml/android-ndk-r7/platforms/android-9/arch-arm
-CC=ccache 
/home/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc
 -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -Wl,--fix-cortex-a8 
--sysroot /home/tml/android-ndk-r7/platforms/android-9/arch-arm 
-L/home/tml/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a
-CXX=ccache 
/home/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++
 -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -Wl,--fix-cortex-a8 
--sysroot /home/tml/android-ndk-r7/platforms/android-9/arch-arm -I 
/home/tml/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/include 
-I/home/tml/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include
 -L/home/tml/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a 
-fexceptions -frtti
-AR=/home/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ar
-NM=/home/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-nm
-OBJDUMP=/home/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-objdump
-RANLIB=/home/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ranlib
-STRIP=/home/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-strip
 CC_FOR_BUILD=ccache gcc
 CXX_FOR_BUILD=ccache g++
+--with-android-ndk=/home/tml/android-ndk-r7
 --build=x86_64-unknown-linux-gnu
 --disable-zenity
 --with-distro=LibreOfficeAndroid
diff --git a/config_host.mk.in b/config_host.mk.in
index f8b0d81..9bd874d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -11,6 +11,7 @@ export ALIGNOF_LONG="@ALIGNOF_LONG@"
 export ALIGNOF_SHORT="@ALIGNOF_SHORT@"
 export ALLOC="@ALLOC@"
 export ANCIENT_BISON="@ANCIENT_BISON@"
+export ANDROID_NDK_HOME="@ANDROID_NDK_HOME@"
 export AR="@AR@"
 export AWTLIB='@AWTLIB@'
 export BARCODE_EXTENSION_PA

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - configure.in scp2/inc scp2/source

[Tor Lillqvist]

 configure.in |4 
 scp2/inc/macros.inc  |2 +-
 scp2/source/ooo/common_brand.scp |2 +-
 scp2/source/ooo/file_library_ooo.scp |6 +++---
 scp2/source/ooo/makefile.mk  |4 
 scp2/source/ooo/ure.scp  |   28 ++--
 6 files changed, 23 insertions(+), 23 deletions(-)

New commits:
commit 23fa04ddda57f710c01f96113cb1b17ff4eafa77
Author: Fridrich Å trba 
Date:   Wed Jan 18 17:50:48 2012 +0200

_MSC_VER is compiler define and cpp.lcc needs to be taught about it

(cherry picked from commit d3f17ac97d1d90069fd66ccc63caab0f0472dc7d)

Signed-off-by: Tor Lillqvist 

diff --git a/configure.in b/configure.in
index c66a6c5..b15f76c 100644
--- a/configure.in
+++ b/configure.in
@@ -160,6 +160,10 @@ cygwin*|interix*|mingw32*)
 fi
 ;;
 esac
+
+if test "$build_os" = "cygwin" ; then
+SCPDEFS="$SCPDEFS -D_MSC_VER"
+fi
 ;;
 
 darwin*) # Mac OS X or iOS
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 4f23947..5f770f7 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -511,7 +511,7 @@ End
 #define SCP2_URE_DL_DIR gid_Dir_Ure_Bin
 #define SCP2_URE_DL_NORMAL(n) n ".dll"
 #define SCP2_URE_DL_BARE(n) n ".dll"
-#if defined _MSC
+#if defined _MSC_VER
 #define SCP2_URE_DL_VER(n, v) n v ".dll"
 #define SCP2_URE_DL_COMID_VER(n, v) n v STRING(COMID) ".dll"
 #define SCP2_URE_DL_COMID_NORMAL(n) n STRING(COMID) ".dll"
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 474d537..6c6fb66 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -554,7 +554,7 @@ End
 #endif
 
 // use this for high detail file open dialog >= 5.1 windows
-#if defined(WNT) && defined( _MSC )
+#if defined( _MSC_VER )
 File gid_Brand_File_Bin_Soffice_Bin_Manifest
 TXT_FILE_BODY;
 Styles = (PACKED);
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index ef75e8c..abcfec4 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -97,7 +97,7 @@ STD_LIB_FILE(gid_File_Lib_Charttools, charttools)
 STD_LIB_FILE(gid_File_Lib_Chartview, chartview)
 
 
-#if defined WNT && defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Lib_Cli_Oootypes_Assembly
 TXT_FILE_BODY;
@@ -114,7 +114,7 @@ End
 
 #endif
 
-#if defined WNT && defined _MSC
+#if defined _MSC_VER
 File gid_File_Lib_Policy_Cli_Oootypes_Assembly
 TXT_FILE_BODY;
 Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
@@ -130,7 +130,7 @@ End
 
 #endif
 
-#if defined WNT && defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Lib_Policy_Cli_Oootypes_Config
 TXT_FILE_BODY;
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 112eed7..854cd69 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -35,10 +35,6 @@ TARGETTYPE=CUI
 .INCLUDE :  settings.mk
 .INCLUDE :  i18npool/version.mk
 
-.IF "$(COM)" == "MSC"
-SCPDEFS+=-D_MSC
-.ENDIF
-
 .IF "$(ENABLE_ONLINE_UPDATE)"!=""
 SCPDEFS+=-DENABLE_ONLINE_UPDATE
 .ENDIF
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index d17c0b7..be2418f 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -439,7 +439,7 @@ File gid_File_Dl_LogUnoUno
 Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
 End
 
-#if defined _MSC
+#if defined _MSC_VER
 File gid_File_Dl_Cli_Uno
 LIB_FILE_BODY;
 Dir = SCP2_URE_DL_DIR;
@@ -449,7 +449,7 @@ File gid_File_Dl_Cli_Uno
 End
 #endif
 
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Dl_Cli_Ure_Assembly
 TXT_FILE_BODY;
@@ -466,7 +466,7 @@ End
 
 #endif
 
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Dl_Policy_Cli_Ure_Assembly
 TXT_FILE_BODY;
@@ -483,7 +483,7 @@ End
 
 #endif
 
-#if defined _MSC 
+#if defined _MSC_VER 
 
 File gid_File_Dl_Policy_Cli_Ure_Config
 TXT_FILE_BODY;
@@ -495,7 +495,7 @@ End
 
 #endif
 
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Dl_Cli_Basetypes_Assembly
 TXT_FILE_BODY;
@@ -512,7 +512,7 @@ End
 
 #endif
 
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Dl_Policy_Cli_Basetypes_Assembly
 TXT_FILE_BODY;
@@ -528,7 +528,7 @@ File gid_File_Dl_Policy_Cli_Basetypes_Assembly
 End
 
 #endif
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Dl_Policy_Cli_Basetypes_Config
 TXT_FILE_BODY;
@@ -541,7 +541,7 @@ End
 #endif
 
 
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Dl_Cli_Uretypes_Assembly
 TXT_FILE_BODY;
@@ -558,7 +558,7 @@ End
 
 #endif
 
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Dl_Policy_Cli_Uretypes_Assembly
 TXT_FILE_BODY;
@@ -575,7 +575,7 @@ End
 
 #endif
 
-#if defined _MSC 
+#if defined _MSC_VER 
 
 File gid_File_Dl_Policy_Cli_Uretypes_Config
 TXT_FILE_BODY;
@@ -587,7 +587,7 @@ End
 
 #endif
 
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Lib_Cli_Cppuhelper_Assembly
 TXT_FILE_BODY;
@@ -604

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - basegfx/inc basegfx/source basegfx/test

[Fridrich Strba]

 basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx |3 -
 basegfx/source/polygon/b2dsvgpolypolygon.cxx|   10 +++
 basegfx/test/boxclipper.cxx |   57 +---
 basegfx/test/clipstate.cxx  |7 +-
 basegfx/test/genericclipper.cxx |   20 +--
 5 files changed, 71 insertions(+), 26 deletions(-)

New commits:
commit 85c6fc38dabf227f98e3b5259188e8ccd3521739
Author: Thorsten Behrens 
Date:   Tue Jan 17 16:32:43 2012 +0100

Fix error in handling 'z' for svg:d string parsing

Previously 'z' did not update the current point to the start
point of the subpath, as required by
http://www.w3.org/TR/SVG/paths.html#PathDataClosePathCommand. Fixed
now, and adapted all the unit tests.

Signed-off-by: Fridrich Å trba 

diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx 
b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
index 0302441..37d2cb5 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
@@ -123,8 +123,7 @@ namespace basegfx
 /** Read poly-polygon from SVG.
 
 This function imports a poly-polygon from an SVG-D
-attribute. Currently, elliptical arc elements are not yet
-supported (and ignored during parsing).
+attribute.
 
 @param o_rPolyPoly
 The output poly-polygon
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx 
b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
index 7a34219..863adf5 100644
--- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
@@ -239,6 +239,14 @@ namespace basegfx
 
 // remember closed state of current polygon
 bIsClosed = true;
+
+// update current point - we're back at the start
+if( aCurrPoly.count() )
+{
+const B2DPoint aFirst( aCurrPoly.getB2DPoint(0) );
+nLastX = aFirst.getX();
+nLastY = aFirst.getY();
+}
 break;
 }
 
@@ -1033,6 +1041,8 @@ namespace basegfx
 if(aPolygon.isClosed())
 {
 aResult.append(lcl_getCommand('Z', 'z', 
bUseRelativeCoordinates));
+// return to first point
+aCurrentSVGPosition = aPolygon.getB2DPoint(0);
 }
 }
 }
diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx
index 05cbb7b..c34b989 100644
--- a/basegfx/test/boxclipper.cxx
+++ b/basegfx/test/boxclipper.cxx
@@ -256,7 +256,6 @@ public:
tools::importFromSvgD(
aTmp2,
aSvg));
-
 CPPUNIT_ASSERT_MESSAGE(
 sName,
 normalizePoly(aTmp2) == normalizePoly(aTmp1));
@@ -264,23 +263,45 @@ public:
 
 void verifyPoly()
 {
-const char* disjunct="m100 100v-200h-200v200zm1100 900v-200h-200v200z";
-const char* equal="m100 100v-200h-200v200zm200 0v-200h-200v200h200z";
-const char* intersectionN="m100 0v-100h-200v100zm200 
100v-200-100h-200v100 200z";
-const char* intersectionE="m100 100v-200h-100v200zm200 
0v-200h-200-100v200h100z";
-const char* intersectionS="m100 100v-200h-200v200 100h200v-100zm0 
0v-100h-200v100z";
-const char* intersectionW="m0 100v-200h-100v200zm200 
0v-200h-200-100v200h100z";
-const char* intersectionNE="m100 0v-100h-100v100zm200 
0v-200h-200v100h-100v200h200v-100z";
-const char* intersectionSE="m200 
200v-200h-100v-100h-200v200h100v100zm100-100v-100h-100v100z";
-const char* intersectionSW="m0 100v-100h-100v100zm200 
0v-200h-200v100h-100v200h200v-100z";
-const char* intersectionNW="m100 
100v-200h-100v-100h-200v200h100v100zm100-100v-100h-100v100z";
-const char* ringIntersection="m150 150v-100h-100v100zm300 
0v-300h-200v-200h-300v300h200v100h-200v300h300v-200zm0-200v-100h-100v100z";
-const char* ringIntersection2="m-50-50v-100h-100v100zm100 
200v-100h-100v100zm500 
0v-300h-200v-200h-300v200h-200v300h200v200h300v-200zm-200-100v-100h100v100zm100-100v-100h-100v100zm100
 200v-100h-100v100z";
-const char* ringIntersectExtraStrip="m-50-50v-100h-100v100zm100 
200v-100h-100v100zm500 
0v-300h-200v-200h-300v200h-200v300h200v200h300v-200zm-200-100v-100h100v25h-50v50h50v25zm150-25v-50h-150v50zm100-75v-100h-100v100zm100
 200v-100h-100v100z";
-// TODO: old clipper impl. debug difference
-//const char* complexIntersections="m100 0h-100v-100 100h-100 
100v100-100zm0 0zm200 0h-100v-100h-100v-100 100h-100v100h-100 
100v100h100v100-100h100v-100zm0 0h-100v-100 100h-100 100v100-100h100zm0 
0v-

[Libreoffice-commits] .: configure.in scp2/inc scp2/source

[Fridrich Strba]

 configure.in |1 +
 scp2/inc/macros.inc  |2 +-
 scp2/source/ooo/common_brand.scp |2 +-
 scp2/source/ooo/file_library_ooo.scp |6 +++---
 scp2/source/ooo/makefile.mk  |4 
 scp2/source/ooo/ure.scp  |   28 ++--
 6 files changed, 20 insertions(+), 23 deletions(-)

New commits:
commit d3f17ac97d1d90069fd66ccc63caab0f0472dc7d
Author: Fridrich Å trba 
Date:   Wed Jan 18 16:19:23 2012 +0100

_MSC_VER is compiler define and cpp.lcc needs to be taught about it

diff --git a/configure.in b/configure.in
index 251cfa8..bb8abe6 100644
--- a/configure.in
+++ b/configure.in
@@ -2582,6 +2582,7 @@ cygwin*)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
 esac
+   SCPDEFS="$SCPDEFS -D_MSC_VER"
 ;;
 
 darwin*)
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index c0f2eff..820a9e2 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -516,7 +516,7 @@ End
 #define SCP2_URE_DL_COMID_NORMAL(n) n STRING(COMID) ".dll"
 #define SCP2_URE_DL_UNO_VER(n, v) n v ".dll"
 #define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure
-#if defined _MSC
+#if defined _MSC_VER
 #define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll"
 #if defined _DEBUG_RUNTIME
 #define SCP2_STDLP_DEBUG "d"
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 474d537..6c6fb66 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -554,7 +554,7 @@ End
 #endif
 
 // use this for high detail file open dialog >= 5.1 windows
-#if defined(WNT) && defined( _MSC )
+#if defined( _MSC_VER )
 File gid_Brand_File_Bin_Soffice_Bin_Manifest
 TXT_FILE_BODY;
 Styles = (PACKED);
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 2565973..3d46339 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -97,7 +97,7 @@ STD_LIB_FILE(gid_File_Lib_Charttools, charttools)
 STD_LIB_FILE(gid_File_Lib_Chartview, chartview)
 
 
-#if defined WNT && defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Lib_Cli_Oootypes_Assembly
 TXT_FILE_BODY;
@@ -114,7 +114,7 @@ End
 
 #endif
 
-#if defined WNT && defined _MSC
+#if defined _MSC_VER
 File gid_File_Lib_Policy_Cli_Oootypes_Assembly
 TXT_FILE_BODY;
 Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
@@ -130,7 +130,7 @@ End
 
 #endif
 
-#if defined WNT && defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Lib_Policy_Cli_Oootypes_Config
 TXT_FILE_BODY;
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 87cc67c..ccba4f8 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -35,10 +35,6 @@ TARGETTYPE=CUI
 .INCLUDE :  settings.mk
 .INCLUDE :  i18npool/version.mk
 
-.IF "$(COM)" == "MSC"
-SCPDEFS+=-D_MSC
-.ENDIF
-
 .IF "$(ENABLE_ONLINE_UPDATE)"!=""
 SCPDEFS+=-DENABLE_ONLINE_UPDATE
 .ENDIF
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index d17c0b7..be2418f 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -439,7 +439,7 @@ File gid_File_Dl_LogUnoUno
 Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
 End
 
-#if defined _MSC
+#if defined _MSC_VER
 File gid_File_Dl_Cli_Uno
 LIB_FILE_BODY;
 Dir = SCP2_URE_DL_DIR;
@@ -449,7 +449,7 @@ File gid_File_Dl_Cli_Uno
 End
 #endif
 
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Dl_Cli_Ure_Assembly
 TXT_FILE_BODY;
@@ -466,7 +466,7 @@ End
 
 #endif
 
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Dl_Policy_Cli_Ure_Assembly
 TXT_FILE_BODY;
@@ -483,7 +483,7 @@ End
 
 #endif
 
-#if defined _MSC 
+#if defined _MSC_VER 
 
 File gid_File_Dl_Policy_Cli_Ure_Config
 TXT_FILE_BODY;
@@ -495,7 +495,7 @@ End
 
 #endif
 
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Dl_Cli_Basetypes_Assembly
 TXT_FILE_BODY;
@@ -512,7 +512,7 @@ End
 
 #endif
 
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Dl_Policy_Cli_Basetypes_Assembly
 TXT_FILE_BODY;
@@ -528,7 +528,7 @@ File gid_File_Dl_Policy_Cli_Basetypes_Assembly
 End
 
 #endif
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Dl_Policy_Cli_Basetypes_Config
 TXT_FILE_BODY;
@@ -541,7 +541,7 @@ End
 #endif
 
 
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Dl_Cli_Uretypes_Assembly
 TXT_FILE_BODY;
@@ -558,7 +558,7 @@ End
 
 #endif
 
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Dl_Policy_Cli_Uretypes_Assembly
 TXT_FILE_BODY;
@@ -575,7 +575,7 @@ End
 
 #endif
 
-#if defined _MSC 
+#if defined _MSC_VER 
 
 File gid_File_Dl_Policy_Cli_Uretypes_Config
 TXT_FILE_BODY;
@@ -587,7 +587,7 @@ End
 
 #endif
 
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Lib_Cli_Cppuhelper_Assembly
 TXT_FILE_BODY;
@@ -604,7 +604,7 @@ End
 
 #endif
 
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly
 TXT_FILE_BODY;
@@ -621,7

[Libreoffice-commits] .: 3 commits - basegfx/inc basegfx/source basegfx/test

[Thorsten Behrens]

 basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx |3 
 basegfx/source/polygon/b2dsvgpolypolygon.cxx|   10 +++
 basegfx/test/boxclipper.cxx |   65 +---
 basegfx/test/clipstate.cxx  |9 +-
 basegfx/test/genericclipper.cxx |   61 +-
 5 files changed, 115 insertions(+), 33 deletions(-)

New commits:
commit 152eaa298545821ec842499947236aeb99696427
Author: Thorsten Behrens 
Date:   Wed Jan 18 15:25:11 2012 +0100

Add more unit test coverage for generic clipper

With the changes Julien brought in via
66fd9a610cd876c236486a2089d8d58dca866e25, thought it was a good idea
to cover those code paths as well - done now, via the
checkCrossoverSolver() tests.

diff --git a/basegfx/test/genericclipper.cxx b/basegfx/test/genericclipper.cxx
index d3b79ce..496f348 100644
--- a/basegfx/test/genericclipper.cxx
+++ b/basegfx/test/genericclipper.cxx
@@ -143,17 +143,54 @@ public:
 validate("validateDiff", pValid, &tools::solvePolygonOperationDiff);
 }
 
+void validateCrossover(const char* pName,
+   const char* pInputSvgD,
+   const char* pValidSvgD)
+{
+rtl::OUString aInput=rtl::OUString::createFromAscii(pInputSvgD);
+rtl::OUString aValid=rtl::OUString::createFromAscii(pValidSvgD);
+B2DPolyPolygon aInputPoly, aValidPoly;
+
+tools::importFromSvgD(aInputPoly, aInput);
+tools::importFromSvgD(aValidPoly, aValid);
+
+CPPUNIT_ASSERT_MESSAGE(
+pName,
+basegfx::tools::exportToSvgD(
+tools::solveCrossovers(aInputPoly)) == aValid);
+}
+
 void checkCrossoverSolver()
 {
-B2DPolyPolygon aPoly;
-tools::importFromSvgD(
-aPoly,
-::rtl::OUString(
-RTL_CONSTASCII_USTRINGPARAM(
-"m0 0 v 5  h 3 h 1 h 1 h 1 v -2 v -3 z"
-"m3 7 v -2 h 1 h 1 h 1 v -2 h 1 v 3 z")));
-
-tools::solveCrossovers(aPoly);
+// partially intersecting polygons, with a common subsection
+validateCrossover(
+"partially intersecting",
+"m0 0 v 5  h 3 h 1 h 1 h 1 v -2 v -3 z"
+  "m3 7 v -2 h 1 h 1 h 1 v -2 h 1 v 3 z",
+"m0 0v5h3 1 1 1v-2-3zm3 7v-2h1 1 1v-2h1v3z");
+
+// first polygon is identical to subset of second polygon
+validateCrossover(
+"full subset",
+"m0 0 v 5  h 3 h 1 h 1 v -5 z"
+  "m3 10 v -5 h 1 h 1 v -5 h -5 v 5 h 3 z",
+"m0 0v5h3 1 1v-5zm3 10v-5zm1-5h1v-5h-5v5h3z");
+
+// first polygon is identical to subset of second polygon, but
+// oriented in the opposite direction
+validateCrossover(
+"full subset, opposite direction",
+"m0 0 v 5 h 3 h 1 h 1 v -5 z"
+  "m3 10 v -5 h -1 h -1 h -1 v -5 h 5 v 5 h 2 z",
+"m0 0v5h1 1 1-1-1-1v-5h5v5-5zm4 5h1 2l-4 5v-5z");
+
+// first polygon is identical to subset of second polygon, and
+// has a curve segment (triggers different code path)
+validateCrossover(
+"full subset, plus curves",
+"m0 0 v 5  h 3 h 1 h 1 c 2 0 2 0 0 -5 z"
+  "m3 10 v -5 h 1 h 1 c 2 0 2 0 0 -5 h -5 v 5 h 3 z",
+"m0 0v5h3 1 1c2 0 2 0 0-5zm3 10v-5zm1-5h1c2 0 2 0 0-5h-5v5h3z");
 }
 
 // Change the following lines only, if you add, remove or rename
commit 13e1fe0561fa80628c031065ad91adfdeade
Author: Thorsten Behrens 
Date:   Tue Jan 17 16:32:43 2012 +0100

Fix error in handling 'z' for svg:d string parsing

Previously 'z' did not update the current point to the start
point of the subpath, as required by
http://www.w3.org/TR/SVG/paths.html#PathDataClosePathCommand. Fixed
now, and adapted all the unit tests.

diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx 
b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
index 0302441..37d2cb5 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
@@ -123,8 +123,7 @@ namespace basegfx
 /** Read poly-polygon from SVG.
 
 This function imports a poly-polygon from an SVG-D
-attribute. Currently, elliptical arc elements are not yet
-supported (and ignored during parsing).
+attribute.
 
 @param o_rPolyPoly
 The output poly-polygon
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx 
b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
index 7a34219..863adf5 100644
--- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
@@ -239,6 +239,14 @@ namespace basegfx
 
 // remember closed state of current polygon
 bIsClosed = true;
+
+// update current poin

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

[Michael Meeks]

 scp2/source/ooo/ure.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 33d0aec1424fa568c026f5569d18b2aab8815019
Author: Fridrich Å trba 
Date:   Wed Jan 18 15:08:02 2012 +0100

Package stlport on Windows when requested (fdo#37561)

Signed-off-by: Michael Meeks 

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index aece726..a7cafa8 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -868,7 +868,7 @@ File gid_File_Dl_Stlport
 Name = SCP2_URE_DL_NORMAL("stlport_sunpro");
 #endif
 #endif
-#elif defined WNT && ((_MSC_VER == 1500) || (_MSC_VER == 1600))
+#elif defined WNT && defined _MSC
 #if defined _DEBUG_RUNTIME
 Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45");
 #else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Fridrich Strba]

 scp2/source/ooo/ure.scp |   28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 7f1d77d9fecdd710d2b2fd17be91a61665baf846
Author: Fridrich Å trba 
Date:   Wed Jan 18 15:13:15 2012 +0100

If COM==_MSC, then OS==WNT and also GUI==WNT

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index a7cafa8..d17c0b7 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -439,7 +439,7 @@ File gid_File_Dl_LogUnoUno
 Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
 End
 
-#if defined WNT && defined _MSC
+#if defined _MSC
 File gid_File_Dl_Cli_Uno
 LIB_FILE_BODY;
 Dir = SCP2_URE_DL_DIR;
@@ -449,7 +449,7 @@ File gid_File_Dl_Cli_Uno
 End
 #endif
 
-#if defined WNT && defined _MSC
+#if defined _MSC
 
 File gid_File_Dl_Cli_Ure_Assembly
 TXT_FILE_BODY;
@@ -466,7 +466,7 @@ End
 
 #endif
 
-#if defined WNT && defined _MSC
+#if defined _MSC
 
 File gid_File_Dl_Policy_Cli_Ure_Assembly
 TXT_FILE_BODY;
@@ -483,7 +483,7 @@ End
 
 #endif
 
-#if defined WNT && defined _MSC 
+#if defined _MSC 
 
 File gid_File_Dl_Policy_Cli_Ure_Config
 TXT_FILE_BODY;
@@ -495,7 +495,7 @@ End
 
 #endif
 
-#if defined WNT && defined _MSC
+#if defined _MSC
 
 File gid_File_Dl_Cli_Basetypes_Assembly
 TXT_FILE_BODY;
@@ -512,7 +512,7 @@ End
 
 #endif
 
-#if defined WNT && defined _MSC
+#if defined _MSC
 
 File gid_File_Dl_Policy_Cli_Basetypes_Assembly
 TXT_FILE_BODY;
@@ -528,7 +528,7 @@ File gid_File_Dl_Policy_Cli_Basetypes_Assembly
 End
 
 #endif
-#if defined WNT && defined _MSC
+#if defined _MSC
 
 File gid_File_Dl_Policy_Cli_Basetypes_Config
 TXT_FILE_BODY;
@@ -541,7 +541,7 @@ End
 #endif
 
 
-#if defined WNT && defined _MSC
+#if defined _MSC
 
 File gid_File_Dl_Cli_Uretypes_Assembly
 TXT_FILE_BODY;
@@ -558,7 +558,7 @@ End
 
 #endif
 
-#if defined WNT && defined _MSC
+#if defined _MSC
 
 File gid_File_Dl_Policy_Cli_Uretypes_Assembly
 TXT_FILE_BODY;
@@ -575,7 +575,7 @@ End
 
 #endif
 
-#if defined WNT && defined _MSC 
+#if defined _MSC 
 
 File gid_File_Dl_Policy_Cli_Uretypes_Config
 TXT_FILE_BODY;
@@ -587,7 +587,7 @@ End
 
 #endif
 
-#if defined WNT && defined _MSC
+#if defined _MSC
 
 File gid_File_Lib_Cli_Cppuhelper_Assembly
 TXT_FILE_BODY;
@@ -604,7 +604,7 @@ End
 
 #endif
 
-#if defined WNT && defined _MSC
+#if defined _MSC
 
 File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly
 TXT_FILE_BODY;
@@ -621,7 +621,7 @@ End
 
 #endif
 
-#if defined WNT && defined _MSC
+#if defined _MSC
 
 File gid_File_Lib_Policy_Cli_Cppuhelper_Config
 TXT_FILE_BODY;
@@ -868,7 +868,7 @@ File gid_File_Dl_Stlport
 Name = SCP2_URE_DL_NORMAL("stlport_sunpro");
 #endif
 #endif
-#elif defined WNT && defined _MSC
+#elif defined _MSC
 #if defined _DEBUG_RUNTIME
 Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45");
 #else
commit aa318df8355334811649055494a03d6336becf66
Author: Fridrich Å trba 
Date:   Wed Jan 18 15:08:02 2012 +0100

Package stlport on Windows when requested (fdo#37561)

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index aece726..a7cafa8 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -868,7 +868,7 @@ File gid_File_Dl_Stlport
 Name = SCP2_URE_DL_NORMAL("stlport_sunpro");
 #endif
 #endif
-#elif defined WNT && ((_MSC_VER == 1500) || (_MSC_VER == 1600))
+#elif defined WNT && defined _MSC
 #if defined _DEBUG_RUNTIME
 Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45");
 #else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 unotools/source/i18n/calendarwrapper.cxx   |   50 ++---
 unotools/source/i18n/charclass.cxx |4 +-
 unotools/source/i18n/instance.hxx  |2 -
 unotools/source/i18n/localedatawrapper.cxx |   28 ++--
 4 files changed, 39 insertions(+), 45 deletions(-)

New commits:
commit 1de8ddb72e6a1bc75f3e70b0024c940098948a4f
Author: Eike Rathke 
Date:   Wed Jan 18 14:05:54 2012 +0100

convert one freshly introduced DBG_ERRORFILE to SAL_WARN

diff --git a/unotools/source/i18n/localedatawrapper.cxx 
b/unotools/source/i18n/localedatawrapper.cxx
index ed95598..2e8ebf7 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -1900,15 +1900,9 @@ void LocaleDataWrapper::evaluateLocaleDataChecking()
 if ( xLD.is() )
 return xLD->getDateAcceptancePatterns( getLocale() );
 }
-catch ( Exception& e )
+catch (const Exception& e)
 {
-#ifdef DBG_UTIL
-rtl::OStringBuffer aMsg("getDateAcceptancePatterns: Exception 
caught\n");
-aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
-DBG_ERRORFILE(aMsg.getStr());
-#else
-(void)e;
-#endif
+SAL_WARN( "unotools.i18n", "getDateAcceptancePatterns: Exception 
caught " << e.Message );
 }
 return ::com::sun::star::uno::Sequence< ::rtl::OUString >(0);
 }
commit 923934d0f41b5b54c9aa4491958cd1939779902d
Author: Eike Rathke 
Date:   Wed Jan 18 14:02:36 2012 +0100

nitpick, it's i18n, not l18n

diff --git a/unotools/source/i18n/calendarwrapper.cxx 
b/unotools/source/i18n/calendarwrapper.cxx
index 2c82da1..23390f9 100644
--- a/unotools/source/i18n/calendarwrapper.cxx
+++ b/unotools/source/i18n/calendarwrapper.cxx
@@ -70,7 +70,7 @@ void CalendarWrapper::loadDefaultCalendar( const 
::com::sun::star::lang::Locale&
 }
 catch (const Exception& e)
 {
-SAL_WARN( "unotools.l18n", "loadDefaultCalendar: Exception caught " << 
e.Message );
+SAL_WARN( "unotools.i18n", "loadDefaultCalendar: Exception caught " << 
e.Message );
 }
 }
 
@@ -84,7 +84,7 @@ void CalendarWrapper::loadCalendar( const ::rtl::OUString& 
rUniqueID, const ::co
 }
 catch (const Exception& e)
 {
-SAL_WARN( "unotools.l18n", "loadCalendar: Exception caught requested: "
+SAL_WARN( "unotools.i18n", "loadCalendar: Exception caught requested: "
 << rUniqueID << "   Locale: " << rLocale.Language << "_" << 
rLocale.Country << " " << e.Message );
 }
 }
@@ -99,7 +99,7 @@ void CalendarWrapper::loadCalendar( const ::rtl::OUString& 
rUniqueID, const ::co
 }
 catch (const Exception& e)
 {
-SAL_WARN( "unotools.l18n", "getAllCalendars: Exception caught " << 
e.Message );
+SAL_WARN( "unotools.i18n", "getAllCalendars: Exception caught " << 
e.Message );
 }
 
 return ::com::sun::star::uno::Sequence< ::rtl::OUString > (0);
@@ -115,7 +115,7 @@ void CalendarWrapper::loadCalendar( const ::rtl::OUString& 
rUniqueID, const ::co
 }
 catch (const Exception& e)
 {
-SAL_WARN( "unotools.l18n", "getUniqueID: Exception caught " << 
e.Message );
+SAL_WARN( "unotools.i18n", "getUniqueID: Exception caught " << 
e.Message );
 }
 return ::rtl::OUString();
 }
@@ -130,7 +130,7 @@ void CalendarWrapper::setDateTime( double nTimeInDays )
 }
 catch (const Exception& e)
 {
-SAL_WARN( "unotools.l18n", "setDateTime: Exception caught " << 
e.Message );
+SAL_WARN( "unotools.i18n", "setDateTime: Exception caught " << 
e.Message );
 }
 }
 
@@ -144,7 +144,7 @@ double CalendarWrapper::getDateTime() const
 }
 catch (const Exception& e)
 {
-SAL_WARN( "unotools.l18n", "getDateTime: Exception caught " << 
e.Message );
+SAL_WARN( "unotools.i18n", "getDateTime: Exception caught " << 
e.Message );
 }
 return 0.0;
 }
@@ -168,7 +168,7 @@ sal_Int32 CalendarWrapper::getCombinedOffsetInMillis(
 }
 catch (const Exception& e)
 {
-SAL_WARN( "unotools.l18n", "setLocalDateTime: Exception caught " << 
e.Message );
+SAL_WARN( "unotools.i18n", "setLocalDateTime: Exception caught " << 
e.Message );
 }
 return nOffset;
 }
@@ -234,7 +234,7 @@ void CalendarWrapper::setLocalDateTime( double nTimeInDays )
 }
 catch (const Exception& e)
 {
-SAL_WARN( "unotools.l18n",  "setLocalDateTime: Exception caught " << 
e.Message );
+SAL_WARN( "unotools.i18n",  "setLocalDateTime: Exception caught " << 
e.Message );
 }
 }
 
@@ -254,7 +254,7 @@ double CalendarWrapper::getLocalDateTime() const
 }
 catch (const Exception& e)
 {
-SAL_WARN( "unotools.l18n",  "getLocalDateTime: Exception caught " << 
e.Message );
+SAL_WARN( "unotools.i18n",  "getLocalDateTime: Exception caught " << 
e.Message );
 }
 return 0.0;
 }
@@ -269,7 +269,7 @@ void CalendarWrapper::setValue( sal_Int16 nFieldIndex, 
sal_Int16 nValue )
 }

[Libreoffice-commits] .: dbaccess/source

[Lionel Elie Mamane]

 dbaccess/source/core/api/KeySet.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ef08c38172f0a19063759a52dd94b70ebd962ed4
Author: Lionel Elie Mamane 
Date:   Wed Jan 18 13:51:14 2012 +0100

Oups... where is my brown paper bag?

diff --git a/dbaccess/source/core/api/KeySet.cxx 
b/dbaccess/source/core/api/KeySet.cxx
index d55f075..a7d9abe 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -1331,7 +1331,7 @@ bool OKeySet::doTryRefetch_throw()  throw(SQLException, 
RuntimeException)
 
 m_xSet = m_xStatement->executeQuery();
 OSL_ENSURE(m_xSet.is(),"No resultset from statement!");
-return m_xSet->next()
+return m_xSet->next();
 }
 
 // 
-
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Fridrich Strba]

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

New commits:
commit 0d995e135d1548b4bed8272340a8f39d2b1f4d69
Author: Bjoern Michaelsen 
Date:   Wed Jan 18 00:49:51 2012 +0100

lp#711673: mozilla-libreoffice mislabeled as OpenOffice.org Plug-in

Signed-off-by: Fridrich Å trba 

diff --git a/extensions/source/nsplugin/source/so_env.cxx 
b/extensions/source/nsplugin/source/so_env.cxx
index 322a2ff..92faaa2 100644
--- a/extensions/source/nsplugin/source/so_env.cxx
+++ b/extensions/source/nsplugin/source/so_env.cxx
@@ -63,7 +63,7 @@
 #include "ns_debug.hxx"
 #include 
 
-#define PLUGIN_NAME "OpenOffice.org"
+#define PLUGIN_NAME "LibreOffice"
 
 // Tranform all strings like %20 in pPath to one char like space
 /*int retoreUTF8(char* pPath)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 dbaccess/source/core/api/CacheSet.cxx  |2 
 dbaccess/source/core/api/KeySet.cxx|   85 +++--
 dbaccess/source/core/api/KeySet.hxx|5 +
 dbaccess/source/core/api/OptimisticSet.cxx |2 
 4 files changed, 65 insertions(+), 29 deletions(-)

New commits:
commit dfcf55a9de3cc928e5612117d0f9f5f3783de2ff
Author: Lionel Elie Mamane 
Date:   Wed Jan 18 12:30:36 2012 +0100

fdo#44813: make the refresh query filter NULL-safe

diff --git a/dbaccess/source/core/api/KeySet.cxx 
b/dbaccess/source/core/api/KeySet.cxx
index 17789ff..b41e68b 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -223,22 +223,56 @@ void OKeySet::findTableColumnsMatching_throw(   const 
Any& i_aTable,
 }
 SAL_WNODEPRECATED_DECLARATIONS_POP
 
+namespace
+{
+void appendOneKeyColumnClause( const ::rtl::OUString &tblName, const 
::rtl::OUString &colName, ::rtl::OUStringBuffer &o_buf )
+{
+static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM("."));
+static ::rtl::OUString s_sParam0(RTL_CONSTASCII_USTRINGPARAM(" ( TRUE 
= ? AND "));
+static ::rtl::OUString s_sParam1(RTL_CONSTASCII_USTRINGPARAM(" = ? OR 
TRUE = ? AND "));
+static ::rtl::OUString s_sParam2(RTL_CONSTASCII_USTRINGPARAM(" IS NULL 
) "));
+o_buf.append(s_sParam0);
+o_buf.append(tblName);
+o_buf.append(s_sDot);
+o_buf.append(colName);
+o_buf.append(s_sParam1);
+o_buf.append(tblName);
+o_buf.append(s_sDot);
+o_buf.append(colName);
+o_buf.append(s_sParam2);
+}
+}
+
+void OKeySet::setOneKeyColumnParameter( sal_Int32 &nPos, const Reference< 
XParameters > &_xParameter, const connectivity::ORowSetValue &_rValue, 
sal_Int32 _nType, sal_Int32 _nScale ) const
+{
+if ( _rValue.isNull() )
+{
+_xParameter->setBoolean( nPos++, false );
+// We do the full call so that the right sqlType is passed to setNull
+setParameter( nPos++, _xParameter, _rValue, _nType, _nScale );
+_xParameter->setBoolean( nPos++, true );
+}
+else
+{
+_xParameter->setBoolean( nPos++, true );
+setParameter( nPos++, _xParameter, _rValue, _nType, _nScale );
+_xParameter->setBoolean( nPos++, false );
+}
+}
+
 ::rtl::OUStringBuffer OKeySet::createKeyFilter()
 {
 static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND "));
 const ::rtl::OUString aQuote= getIdentifierQuoteString();
 ::rtl::OUStringBuffer aFilter;
-static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM("."));
-static ::rtl::OUString s_sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?"));
 // create the where clause
 Reference xMeta = m_xConnection->getMetaData();
 SelectColumnsMetaData::iterator aPosEnd = m_pKeyColumnNames->end();
 for(SelectColumnsMetaData::iterator aPosIter = 
m_pKeyColumnNames->begin();aPosIter != aPosEnd;)
 {
-aFilter.append(::dbtools::quoteTableName( 
xMeta,aPosIter->second.sTableName,::dbtools::eInDataManipulation));
-aFilter.append(s_sDot);
-aFilter.append(::dbtools::quoteName( 
aQuote,aPosIter->second.sRealName));
-aFilter.append(s_sParam);
+appendOneKeyColumnClause(::dbtools::quoteTableName( 
xMeta,aPosIter->second.sTableName,::dbtools::eInDataManipulation),
+ ::dbtools::quoteName( 
aQuote,aPosIter->second.sRealName),
+ aFilter);
 ++aPosIter;
 if(aPosIter != aPosEnd)
 aFilter.append(aAnd);
@@ -276,8 +310,6 @@ void OKeySet::construct(const Reference< XResultSet>& 
_xDriverSet,const ::rtl::O
 {
 static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND "));
 const ::rtl::OUString aQuote= getIdentifierQuoteString();
-static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM("."));
-static ::rtl::OUString s_sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?"));
 const ::rtl::OUString* pIter = aSeq.getConstArray();
 const ::rtl::OUString* pEnd   = pIter + aSeq.getLength();
 for(;pIter != pEnd;++pIter)
@@ -294,12 +326,11 @@ void OKeySet::construct(const Reference< XResultSet>& 
_xDriverSet,const ::rtl::O
 for(SelectColumnsMetaData::iterator aPosIter = 
(*m_pForeignColumnNames).begin();aPosIter != aPosEnd;++aPosIter)
 {
 // look for columns not in the source columns to use them 
as filter as well
-if ( aFilter.getLength() )
-aFilter.append(aAnd);
-aFilter.append(::dbtools::quoteName( 
aQuote,sSelectTableName));
-aFilter.append(s_sDot);
-aFilter.append(::dbtools::quoteName( 
aQuote,aPosIter->second.sRealName));
-aFilter.append(s_sParam);
+if ( aFilter.getLength() )
+aFilter.append(aAnd);
+

[Libreoffice-commits] .: dbaccess/source

[Lionel Elie Mamane]

 dbaccess/source/core/api/KeySet.cxx |   80 +++-
 dbaccess/source/core/api/KeySet.hxx |1 
 2 files changed, 26 insertions(+), 55 deletions(-)

New commits:
commit 773668c6ab0963f56f98270b29d595f5df7c4bb2
Author: Lionel Elie Mamane 
Date:   Wed Jan 18 13:10:12 2012 +0100

OKeySet: tryRefetch and refreshRow share most of their code

diff --git a/dbaccess/source/core/api/KeySet.cxx 
b/dbaccess/source/core/api/KeySet.cxx
index 46444e9..d55f075 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -881,45 +881,9 @@ void OKeySet::tryRefetch(const ORowSetRow& 
_rInsertRow,bool bRefetch)
 {
 if ( bRefetch )
 {
-// we just areassign the base members
 try
 {
-Reference< XParameters > xParameter(m_xStatement,UNO_QUERY);
-OSL_ENSURE(xParameter.is(),"No Parameter interface!");
-xParameter->clearParameters();
-
-sal_Int32 nPos=1;
-connectivity::ORowVector< ORowSetValue >::Vector::const_iterator 
aParaIter;
-connectivity::ORowVector< ORowSetValue >::Vector::const_iterator 
aParaEnd;
-OUpdatedParameter::iterator aUpdateFind = 
m_aUpdatedParameter.find(m_aKeyIter->first);
-if ( aUpdateFind == m_aUpdatedParameter.end() )
-{
-aParaIter = m_aParameterValueForCache.get().begin();
-aParaEnd = m_aParameterValueForCache.get().end();
-}
-else
-{
-aParaIter = aUpdateFind->second.get().begin();
-aParaEnd = aUpdateFind->second.get().end();
-}
-
-for(++aParaIter;aParaIter != aParaEnd;++aParaIter,++nPos)
-{
-::dbtools::setObjectWithInfo( xParameter, nPos, 
aParaIter->makeAny(), aParaIter->getTypeKind() );
-}
-connectivity::ORowVector< ORowSetValue >::Vector::const_iterator 
aIter2 = m_aKeyIter->second.first->get().begin();
-SelectColumnsMetaData::const_iterator aPosIter = 
(*m_pKeyColumnNames).begin();
-SelectColumnsMetaData::const_iterator aPosEnd = 
(*m_pKeyColumnNames).end();
-for(;aPosIter != aPosEnd;++aPosIter,++aIter2)
-
setOneKeyColumnParameter(nPos,xParameter,*aIter2,aPosIter->second.nType,aPosIter->second.nScale);
-aPosIter = (*m_pForeignColumnNames).begin();
-aPosEnd = (*m_pForeignColumnNames).end();
-for(;aPosIter != aPosEnd;++aPosIter,++aIter2)
-
setOneKeyColumnParameter(nPos,xParameter,*aIter2,aPosIter->second.nType,aPosIter->second.nScale);
-
-m_xSet = m_xStatement->executeQuery();
-OSL_ENSURE(m_xSet.is(),"No resultset form statement!");
-bRefetch = m_xSet->next();
+bRefetch = doTryRefetch_throw();
 }
 catch(const Exception&)
 {
@@ -1327,22 +1291,9 @@ sal_Bool SAL_CALL OKeySet::previous(  ) 
throw(SQLException, RuntimeException)
 return previous_checked(sal_True);
 }
 
-// 
-
-void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException)
+bool OKeySet::doTryRefetch_throw()  throw(SQLException, RuntimeException)
 {
-RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "ocke.jans...@sun.com", 
"OKeySet::refreshRow" );
-if(isBeforeFirst() || isAfterLast() || !m_xStatement.is())
-return;
-
-m_xRow = NULL;
-::comphelper::disposeComponent(m_xSet);
-
-if ( m_aKeyIter->second.second.second.is() )
-{
-m_xRow = m_aKeyIter->second.second.second;
-return;
-}
-// we just areassign the base members
+// we just reassign the base members
 Reference< XParameters > xParameter(m_xStatement,UNO_QUERY);
 OSL_ENSURE(xParameter.is(),"No Parameter interface!");
 xParameter->clearParameters();
@@ -1379,8 +1330,27 @@ void SAL_CALL OKeySet::refreshRow() throw(SQLException, 
RuntimeException)
 
setOneKeyColumnParameter(nPos,xParameter,*aIter,aPosIter->second.nType,aPosIter->second.nScale);
 
 m_xSet = m_xStatement->executeQuery();
-OSL_ENSURE(m_xSet.is(),"No resultset form statement!");
-sal_Bool bOK = m_xSet->next();
+OSL_ENSURE(m_xSet.is(),"No resultset from statement!");
+return m_xSet->next()
+}
+
+// 
-
+void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException)
+{
+RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "ocke.jans...@sun.com", 
"OKeySet::refreshRow" );
+if(isBeforeFirst() || isAfterLast() || !m_xStatement.is())
+return;
+
+m_xRow = NULL;
+::comphelper::disposeComponent(m_xSet);
+
+if ( m_aKeyIter->second.second.second.is() )
+{
+m_xRow = m_aKeyIter->second.second.second;
+return;
+}
+
+sal_Bool bOK = doTryRefetch_throw();
 if ( !bOK )
 

[Libreoffice-commits] .: 2 commits - connectivity/inc dbaccess/source

[Lionel Elie Mamane]

 connectivity/inc/connectivity/dbtools.hxx |4 -
 dbaccess/source/core/api/KeySet.cxx   |   71 +-
 dbaccess/source/core/api/KeySet.hxx   |5 ++
 dbaccess/source/core/api/RowSet.hxx   |2 
 4 files changed, 59 insertions(+), 23 deletions(-)

New commits:
commit c2567a658735423948d76992ca744a4187620928
Author: Lionel Elie Mamane 
Date:   Wed Jan 18 12:31:06 2012 +0100

janitorial: typo in comments

diff --git a/connectivity/inc/connectivity/dbtools.hxx 
b/connectivity/inc/connectivity/dbtools.hxx
index 3555025..24f39cb 100644
--- a/connectivity/inc/connectivity/dbtools.hxx
+++ b/connectivity/inc/connectivity/dbtools.hxx
@@ -615,7 +615,7 @@ namespace dbtools
 const ::com::sun::star::uno::Reference< 
::com::sun::star::task::XInteractionHandler >& _rxHandler,
 const ::std::vector >& 
_aParametersSet = ::std::vector >());
 
-/** call the appropiate set method for the specific sql type @see 
com::sun::star::sdbc::DataType
+/** call the appropriate set method for the specific sql type @see 
com::sun::star::sdbc::DataType
 @param  _xParamsthe parameters where to set the value
 @param  parameterIndex  the index of the parameter, 1 based
 @param  x   the value to set
@@ -629,7 +629,7 @@ namespace dbtools
 sal_Int32 sqlType,
 sal_Int32 scale=0) 
throw(::com::sun::star::sdbc::SQLException, 
::com::sun::star::uno::RuntimeException);
 
-/** call the appropiate set method for the specific sql type @see 
com::sun::star::sdbc::DataType
+/** call the appropriate set method for the specific sql type @see 
com::sun::star::sdbc::DataType
 @param  _xParamsthe parameters where to set the value
 @param  parameterIndex  the index of the parameter, 1 based
 @param  x   the value to set
diff --git a/dbaccess/source/core/api/RowSet.hxx 
b/dbaccess/source/core/api/RowSet.hxx
index 40e1920..42ca4b3 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -223,7 +223,7 @@ namespace dbaccess
 void checkUpdateIterator();
 const connectivity::ORowSetValue& getInsertValue(sal_Int32 
columnIndex);
 void setParameter(sal_Int32 parameterIndex, const 
connectivity::ORowSetValue& x);
-// resizes the parameter vector if nescessary
+// resizes the parameter vector if necessary
 ::connectivity::ORowSetValue& getParameterStorage( sal_Int32 
parameterIndex );
 
 void updateValue(sal_Int32 columnIndex,const 
connectivity::ORowSetValue& x);
commit 3623701d65f92017da905f4debf5514045f502c8
Author: Lionel Elie Mamane 
Date:   Wed Jan 18 12:30:36 2012 +0100

fdo#44813: make the refresh query filter NULL-safe

diff --git a/dbaccess/source/core/api/KeySet.cxx 
b/dbaccess/source/core/api/KeySet.cxx
index 6024f3f..46444e9 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -223,22 +223,56 @@ void OKeySet::findTableColumnsMatching_throw(   const 
Any& i_aTable,
 }
 SAL_WNODEPRECATED_DECLARATIONS_POP
 
+namespace
+{
+void appendOneKeyColumnClause( const ::rtl::OUString &tblName, const 
::rtl::OUString &colName, ::rtl::OUStringBuffer &o_buf )
+{
+static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM("."));
+static ::rtl::OUString s_sParam0(RTL_CONSTASCII_USTRINGPARAM(" ( TRUE 
= ? AND "));
+static ::rtl::OUString s_sParam1(RTL_CONSTASCII_USTRINGPARAM(" = ? OR 
TRUE = ? AND "));
+static ::rtl::OUString s_sParam2(RTL_CONSTASCII_USTRINGPARAM(" IS NULL 
) "));
+o_buf.append(s_sParam0);
+o_buf.append(tblName);
+o_buf.append(s_sDot);
+o_buf.append(colName);
+o_buf.append(s_sParam1);
+o_buf.append(tblName);
+o_buf.append(s_sDot);
+o_buf.append(colName);
+o_buf.append(s_sParam2);
+}
+}
+
+void OKeySet::setOneKeyColumnParameter( sal_Int32 &nPos, const Reference< 
XParameters > &_xParameter, const connectivity::ORowSetValue &_rValue, 
sal_Int32 _nType, sal_Int32 _nScale ) const
+{
+if ( _rValue.isNull() )
+{
+_xParameter->setBoolean( nPos++, false );
+// We do the full call so that the right sqlType is passed to setNull
+setParameter( nPos++, _xParameter, _rValue, _nType, _nScale );
+_xParameter->setBoolean( nPos++, true );
+}
+else
+{
+_xParameter->setBoolean( nPos++, true );
+setParameter( nPos++, _xParameter, _rValue, _nType, _nScale );
+_xParameter->setBoolean( nPos++, false );
+}
+}
+
 ::rtl::OUStringBuffer OKeySet::createKeyFilter()
 {
 static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND "));
 const ::rtl::OUString aQuote= getIdentifierQuoteString();
 ::rtl::OUStringBuffer aFilter;
-static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM(".

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/util solenv/inc

[Fridrich Strba]

 instsetoo_native/util/openoffice.lst |   30 +++---
 solenv/inc/minor.mk  |4 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 2f1fa4abea5035cdf83331dd18b86b6fd6393d88
Author: Fridrich Å trba 
Date:   Wed Jan 18 10:28:55 2012 +0100

bump product version to 3.5.0-rc1+, release number to 11

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 18d804d..dba6be7 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -53,13 +53,13 @@ LibreOffice
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION beta3
+   SHORT_PRODUCTEXTENSION rc1
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.0
-   ABOUTBOXPRODUCTVERSIONSUFFIX beta3+
+   ABOUTBOXPRODUCTVERSIONSUFFIX rc1+
BASEPRODUCTVERSION 3.5
 PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -112,13 +112,13 @@ LibreOffice_wJRE
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION beta3
+   SHORT_PRODUCTEXTENSION rc1
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.0
-   ABOUTBOXPRODUCTVERSIONSUFFIX beta3+
+   ABOUTBOXPRODUCTVERSIONSUFFIX rc1+
BASEPRODUCTVERSION 3.5
UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
@@ -170,14 +170,14 @@ LibreOffice_Dev
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
-   SHORT_PRODUCTEXTENSION beta3
+   SHORT_PRODUCTEXTENSION rc1
UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.5.0
-   ABOUTBOXPRODUCTVERSIONSUFFIX beta3+
+   ABOUTBOXPRODUCTVERSIONSUFFIX rc1+
BASEPRODUCTVERSION 3.5
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
@@ -240,7 +240,7 @@ URE
 PRODUCTEXTENSION
 BRANDPACKAGEVERSION 3.5
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta3
+SHORT_PRODUCTEXTENSION rc1
 LICENSENAME LGPL
 SETSTATICPATH 1
 NOVERSIONINDIRNAME 1
@@ -275,7 +275,7 @@ LibreOffice_SDK
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta3
+SHORT_PRODUCTEXTENSION rc1
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.5
@@ -318,7 +318,7 @@ LibreOffice_Dev_SDK
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta3
+SHORT_PRODUCTEXTENSION rc1
 UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
@@ -367,7 +367,7 @@ LibreOffice_Test
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta3
+SHORT_PRODUCTEXTENSION rc1
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.5
@@ -410,7 +410,7 @@ LibreOffice_Dev_Test
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION beta3
+SHORT_PRODUCTEXTENSION rc1
 UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
@@ -458,13 +458,13 @@ OxygenOffice
PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-   SHORT_PRODUCTEXTENSION  beta3
+   SHORT_PRODUCTEXTENSION  rc1
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONU

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

[Fridrich Strba]

 0 files changed

New commits:
commit 8c0b45513a139657678484b73112dc5eba800dac
Author: Fridrich Å trba 
Date:   Wed Jan 18 09:24:57 2012 +0100

Version 3.5.0.1, tag libreoffice-3.5.0.1 (3.5.0-rc1)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .:

[Fridrich Strba]

 0 files changed

New commits:
commit 65c2974092301ed5e4c893299b29e6d1f3d9160b
Author: Fridrich Å trba 
Date:   Wed Jan 18 09:15:49 2012 +0100

Version 3.5.0.1, tag libreoffice-3.5.0.1 (3.5.0-rc1)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'refs/tags/libreoffice-3.5.0.1' - 3 commits - binfilter/bf_sch binfilter/bf_sw

[Fridrich Strba]

Rebased ref, commits from common ancestor:
commit 8c0b45513a139657678484b73112dc5eba800dac
Author: Fridrich Å trba 
Date:   Wed Jan 18 09:24:57 2012 +0100

Version 3.5.0.1, tag libreoffice-3.5.0.1 (3.5.0-rc1)
commit 539d9db35d08904e03366c51105f60385f84
Author: David Tardon 
Date:   Tue Jan 10 19:32:51 2012 +0100

fix for gcc 4.7/C++11: these are not string literal operators

Signed-off-by: David Tardon 

diff --git a/binfilter/bf_sch/source/core/sch_globfunc.cxx 
b/binfilter/bf_sch/source/core/sch_globfunc.cxx
index 6a81bf1..ac87608 100644
--- a/binfilter/bf_sch/source/core/sch_globfunc.cxx
+++ b/binfilter/bf_sch/source/core/sch_globfunc.cxx
@@ -1193,7 +1193,7 @@ namespace binfilter {
 /*N*/   const USHORT* pRanges = rSet.GetRanges();
 /*N*/   for( long n = 0; pRanges[ n ] && n<32; n+=2 )
 /*N*/   {
-/*N*/   snprintf( pSmallBuf, sizeof(pSmallBuf), "[%"SAL_PRIdINT32"; 
%"SAL_PRIdINT32"] ", (sal_uInt32)pRanges[ n ], (sal_uInt32)pRanges[ n+1 ] );
+/*N*/   snprintf( pSmallBuf, sizeof(pSmallBuf), "[%" SAL_PRIdINT32 "; %" 
SAL_PRIdINT32 "] ", (sal_uInt32)pRanges[ n ], (sal_uInt32)pRanges[ n+1 ] );
 /*N*/   strncat( pBuf, pSmallBuf, sizeof(pBuf) - strlen(pBuf) - 1 );
 /*N*/   }
 /*N*/
@@ -1219,7 +1219,7 @@ namespace binfilter {
 /*N*/   nCns++;
 /*N*/   if( nCnt < 100 )
 /*N*/   {
-/*N*/   snprintf( pSmallBuf, sizeof(pSmallBuf), "%"SAL_PRIdINT32", 
", (sal_uInt32) nWhich );
+/*N*/   snprintf( pSmallBuf, sizeof(pSmallBuf), "%" SAL_PRIdINT32 
", ", (sal_uInt32) nWhich );
 /*N*/   strncat( pBuf, pSmallBuf, sizeof(pBuf) - strlen(pBuf) - 1 
);
 /*N*/   }
 /*N*/
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx 
b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index 6548a85..3da5855 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -1646,7 +1646,7 @@ void Sw3StringPool::LoadOld( SvStream& r )
 /*N*/   if( pCrypter )
 /*N*/   {
 /*?*/   sal_Char buf[ 17 ];
-/*?*/   snprintf( buf, sizeof(buf), 
"%08"SAL_PRIxUINT32"%08"SAL_PRIxUINT32, nDate, nTime );
+/*?*/   snprintf( buf, sizeof(buf), "%08" SAL_PRIxUINT32 "%08" 
SAL_PRIxUINT32, nDate, nTime );
 /*?*/   rtl::OStringBuffer aTest( buf );
 /*?*/   pCrypter->Encrypt( aTest );
 /*?*/   return sal_Bool( !memcmp( cPasswd, aTest.getStr(), PASSWDLEN ) );
@@ -1664,7 +1664,7 @@ void Sw3StringPool::LoadOld( SvStream& r )
 /*N*/   {
 /*?*/   pCrypter = new Crypter( pRoot->GetKey() );
 /*?*/   sal_Char buf[ 17 ];
-/*?*/   snprintf( buf, sizeof(buf), 
"%08"SAL_PRIxUINT32"%08"SAL_PRIxUINT32, nDate, nTime );
+/*?*/   snprintf( buf, sizeof(buf), "%08" SAL_PRIxUINT32 "%08" 
SAL_PRIxUINT32, nDate, nTime );
 /*?*/   rtl::OStringBuffer aTest( buf );
 /*?*/   pCrypter->Encrypt( aTest );
 /*?*/   memcpy( cPasswd, aTest.getStr(), aTest.getLength() );
commit 7f15fcac486ea45c3ca77db7f93506850a022e5e
Author: Petr Mladek 
Date:   Tue Dec 6 14:15:08 2011 +0100

Branch libreoffice-3-5

This is 'libreoffice-3-5' - the stable branch for the 3.5.x releases.
The commit rules are different according to the development phase:

+ 3.5.0 beta phase:

+ any bug fixes are allowed without review
+ late features need approval by 2 people with different affiliation

+ 3.5.0 rc phase and later:

+ fixes need approval by one reviewer
+ late features need approval by 2 more people with different 
affiliation

IMPORTANT: Every developer is responsible for pushing the fixes into all
   appropriate branches. Note that we do not plan any merge
   from this branch to master or vice versa.

Please, help use to make stable and usable release. If you want to build
something cool, unstable, and risky, use master.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.0.1'

[Fridrich Strba]

Tag 'libreoffice-3.5.0.1' created by Fridrich Å trba 
 at 2012-01-18 08:16 +0100

Tag 3.5.0.1 (3.5.0-rc1)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.18 (GNU/Linux)

iQIcBAABAgAGBQJPFn/zAAoJEPQ0oe+v7q6j4LEP+QG/Mc93lGD6mlsoiKmMVNKc
Sn737QmTBDbAHgEJWMFe1+gYOxb8A5WygymedvFT+2iWSj03UF2IbVkfIRVGYxjv
uJX8wFTbuh6+5FPqabljzM2kN3hucq/rVOpTfO+0YOHoIpTmLThbeQnxmEUWw/jW
/OvcD7FNLeycBhuaBc+oaTiCd8fx6rfY7FM9wLeSiVQgCPWgE3U+Fg4ovGiN98Bh
fkjckq4wjL5/0bCJImOTyMHjEjYev3/dll6g8UGnwZEtlngfkAuri8SEWgkVWZ2Q
I/eF2srAh4Y03phYognS44qIphcaTcgOkIw6k2BZPOimEraV05AnrjOZvkrPgg3U
hLv3sACwSi11kA9+oyGvfm3TE06O6hCH+Ddb99K3oKXdG7eWwDvrXfM5D0SH4+ja
GAGU7CH+6gGMkjuDhtJF/lzLt5vPfianCu0s2gf9n0PNAN7f6ZySTF2VbcVJ4gmX
CNkNFbwbNl8TM5K73LdIymF34bEHhvT9WVSWm8og4rBrDoHUpzRFMNjQxRQIFX7q
GU6L9Yj93UeM60S/+bEO98J1HeNhla2WBEYGSS8F+IAL/mdALndJCzpFbxjQ52aH
r8U80c7wyr1TyNg5DhZIE0tan+XSiwh1mTq312BPfNLGHmSMm6pijna2P1BhS8Rg
cloqphRfXYDSB+7m47Vl
=hfNj
-END PGP SIGNATURE-

Changes since libreoffice-3-5-branch-point-37:
---
 0 files changed
---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.0.1'

[Fridrich Strba]

Tag 'libreoffice-3.5.0.1' created by Fridrich Å trba 
 at 2012-01-17 21:55 +0100

Tag 3.5.0.1 (3.5.0-rc1)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.18 (GNU/Linux)

iQIcBAABAgAGBQJPFe5CAAoJEPQ0oe+v7q6jLv0P/jTnFP8pZ9tknA4CX21kIcmF
tYCJnhEmQOqZQZG9ryaRiM3o8Lc7FGtBaYl5RLqqZ4MigSiP5ukMTnOoBjIQrCGW
uEQLPsPZSc7KpXno2O1SM08NGUH498WviYw2ea1z7efMS1dkQx/Gvv7XKK1WBnyl
/rnnL50xjl3ydJL4r7ctYi6XZ43sQR8CsHmDY3RCtZ5UilIoPXXcQmFQwzhQIo2V
20YolI4TN7GjqkxQwqphgfTpqCvvc5M5FDBCKIX+w9umUwiX5u4Z00yH3PLSPAWe
mzz+gasecWHlj3hZhhbUmFu2AOsf84LjUX9AqU52XSNLJiwJUOvvIRIrXSo9pe3v
88JqZNQJqXepN0fs/zoeLL2yHigTSiSSMsALDrrB7Vd/6cw8+oZgGrJughRYt+84
sGlxkiXwoTxGfxawL0xogEXWwtxEFrLmyJoD6zkndO1N9FxrtMfExVYvzsPDajmu
rSEURN1Otp9Q9G986xH+Cc/ZWmzfzCN5U1vDCq3YSzsoZawQDobqcbqjQOy0Jgpn
S0JNxSz8NJc0L08PP5U2yzXoyCG2DnXsi1fy5JKU8EYDKAitQFh41CiwvVIUMsHV
K3MO6jGCjM0xKD5ALyWKhMuG6ahvUpb742XAGQpA0kicA+nDo7QVwGNeZPwjgPmk
2luEExA96nYwMiHTPJT0
=7WnG
-END PGP SIGNATURE-

Changes since libreoffice-3-5-branch-point-24:
---
 0 files changed
---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.0.1'

[Fridrich Strba]

Tag 'libreoffice-3.5.0.1' created by Fridrich Å trba 
 at 2012-01-17 21:55 +0100

Tag 3.5.0.1 (3.5.0-rc1)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.18 (GNU/Linux)

iQIcBAABAgAGBQJPFe5CAAoJEPQ0oe+v7q6jgroQALd3rruLwq/0JCHJSKgRdmFZ
jd1UM7Yv43hBjej9ALptDPf0QOJ2qluUKXwcbta0/FKgVy3KIIwZdYdTALHtQwmo
G5qXzNO4ZpKgg1OdQFPcaSqZp2XWlH0i/GeE8r9bzzV69tM9dsVOThbvJk3Z8Mt5
nsaFLBfMR4MvUO5ANTC1G1hmSph0NdRLmVkUvINcQPswvUt+CMmNHDD+ApxOdC6O
YUbu/8FTTzHkOmI0cz6KHBo4F3D0xqAmpcbBzGnrZb3i6KlFkm4+c00G/qxZe4B0
0DChQtTVISXtbP4LkPSiQUAk6+xHuDkvvL/s4CWQRNZNdVYSwAPvdz8y+QcJGDbl
80vEwRWnmFAUB37ztFn5fw5eq1QsrrlMGeUJxxf9fI54HcVaAU5SMEiItc069oiO
M3NlxozXqG2ZeYfWyAliuvA0C5pl6l9Og22yTydbnxLekWGP2cbwaYcq5Xl6l3CC
1u+drV0z6JorQwmiA3KR5tRAyikfOF/IWsGe+TwRJ+YWZ+aeuLqLboogU2CYkjqE
ss3YnnZrKG8C0m+dbnY3g44FYijf8xde6wcYF4PjWRpk42Ovxl7IVjNKUkTfxGr0
72RZ8jrCuE6Bpn+g55qiRWtl0JulLXqGM5belUlkekE/Y5F6Y7l5LD/H0PudufB7
UHDNB6QYuBSRw3bCpR/X
=IMwQ
-END PGP SIGNATURE-

Changes since libreoffice-3-5-branch-point-595:
---
 0 files changed
---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits