[Libreoffice-commits] .: sot/source

[Stephan Bergmann]

 sot/source/sdstor/stgcache.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3af05d9da637c232a28ac7c5aa396c95118eee3b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jan 31 09:17:53 2012 +0100

SWAPLONG - OSL_SWAPDWORD

diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx
index 48e0f7d..3d467df 100644
--- a/sot/source/sdstor/stgcache.cxx
+++ b/sot/source/sdstor/stgcache.cxx
@@ -91,7 +91,7 @@ void StgPage::SetPage( short nOff, sal_Int32 nVal )
 if( ( nOff  (short) ( nData / sizeof( sal_Int32 ) ) )  nOff = 0 )
 {
 #ifdef OSL_BIGENDIAN
-  nVal = SWAPLONG(nVal);
+  nVal = OSL_SWAPDWORD(nVal);
 #endif
 ((sal_Int32*) pData )[ nOff ] = nVal;
 bDirty = sal_True;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

[Ivan Timofeev]

 sc/source/ui/src/globstr.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0a9d8c07ddf054930e1b000cc3c972a3d217d71c
Author: Ivan Timofeev timofeev@gmail.com
Date:   Tue Jan 31 12:42:08 2012 +0400

':' is not allowed in sheet names as well

diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 18e924b..2e852ec 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -687,7 +687,7 @@ Resource RID_GLOBSTR
 };
 String STR_INVALIDTABNAME
 {
-Text [ en-US ] = Invalid sheet name.\nThe sheet name must not be a 
duplicate of an existing name \nand may not contain the characters [ ] * ? / 
\\ ;
+Text [ en-US ] = Invalid sheet name.\nThe sheet name must not be a 
duplicate of an existing name \nand may not contain the characters [ ] * ? : / 
\\ ;
 };
 String STR_SCENARIO
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/osl

[François Tigeot]

 sal/osl/unx/system.h |   23 ---
 1 file changed, 23 deletions(-)

New commits:
commit 4178a9bc423912687c8cefd327e35bffccb53a97
Author: François Tigeot ftig...@wolfpond.org
Date:   Tue Jan 31 09:41:16 2012 +0100

Remove unused endianess defines

diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index 1830bf3..881bc88 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -135,11 +135,6 @@
 #   include netinet/tcp.h
 #   include dlfcn.h
 #   include machine/endian.h
-#   if BYTE_ORDER == LITTLE_ENDIAN
-#   define _LITTLE_ENDIAN_OO
-#   elif BYTE_ORDER == BIG_ENDIAN
-#   define _BIG_ENDIAN_OO
-#   endif
 #   define  IORESOURCE_TRANSFER_BSD
 #   define  IOCHANNEL_TRANSFER_BSD_RENO
 #   define  pthread_testcancel()
@@ -341,24 +336,6 @@ int macxp_resolveAlias(char *path, int buflen);
 #   error Target platform not specified!
 #endif
 
-#if defined(NETBSD)
-#if defined _LITTLE_ENDIAN_OO
-#   define _OSL_BIGENDIAN
-#elif defined _BIG_ENDIAN_OO
-#   define _OSL_LITENDIAN
-#else
-#   error undetermined endianess
-#endif
-#else
-#if defined _LITTLE_ENDIAN
-#   define _OSL_BIGENDIAN
-#elif defined _BIG_ENDIAN
-#   define _OSL_LITENDIAN
-#else
-#   error undetermined endianess
-#endif
-#endif
-
 #ifndef PTR_FD_SET
 #   define PTR_FD_SET(s)((s))
 #endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Fridrich Strba]

 postgresql/makefile.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 165a5bea14f538ea249ec1567d6c4aa08d5bb174
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Jan 30 14:41:06 2012 +0100

Fix build of postgresql module with mozilla ldap on WNTMSC

diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 9b5cb35..0c2e3be 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -54,6 +54,7 @@ CONFIGURE_DIR=.
 BUILD_DIR=src
 
 CONFIGURE_ACTION =
+SOLARINC += -I$(SOLARVER)$/$(INPATH)$/inc$/mozilla$/ldap
 BUILD_ACTION = nmake -f win32.mak USE_SSL=1 USE_LDAP=1 USE_MOZLDAP=1
 .ELSE
 CONFIGURE_DIR=.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 xmloff/inc/xmloff/nmspmap.hxx  |   24 ++--
 xmloff/source/core/nmspmap.cxx |   23 +--
 2 files changed, 19 insertions(+), 28 deletions(-)

New commits:
commit 965f3ae45ad605baf4d25d3cc8aaa9be85886b97
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jan 31 11:32:02 2012 +0100

Clean up

diff --git a/xmloff/inc/xmloff/nmspmap.hxx b/xmloff/inc/xmloff/nmspmap.hxx
index 79139ef..816f2d3 100644
--- a/xmloff/inc/xmloff/nmspmap.hxx
+++ b/xmloff/inc/xmloff/nmspmap.hxx
@@ -30,11 +30,14 @@
 #define _XMLOFF_NMSPMAP_HXX
 
 #include sal/config.h
+
+#include map
+#include utility
+
 #include xmloff/dllapi.h
 #include sal/types.h
 #include rtl/ustring.hxx
 #include boost/unordered_map.hpp
-#include map
 #include rtl/ref.hxx
 #include cppuhelper/weak.hxx
 
@@ -73,25 +76,17 @@ struct uInt32lt
 return r1  r2;
 }
 };
-typedef ::std::pair  sal_uInt16, const ::rtl::OUString*  QNamePair;
+typedef ::std::pair  sal_uInt16, rtl::OUString  QNamePair;
 
 struct QNamePairHash
 {
 size_t operator()( const QNamePair r1 ) const
 {
-return (size_t) r1.second-hashCode() + r1.first;
-}
-};
-struct QNamePairEq
-{
-bool operator()( const QNamePair r1,
- const QNamePair r2 ) const
-{
-return r1.first == r2.first  *(r1.second) == *(r2.second);
+return (size_t) r1.second.hashCode() + r1.first;
 }
 };
 
-typedef ::boost::unordered_map  QNamePair, ::rtl::OUString, QNamePairHash, 
QNamePairEq  QNameCache;
+typedef ::boost::unordered_map  QNamePair, ::rtl::OUString, QNamePairHash  
QNameCache;
 typedef ::boost::unordered_map  ::rtl::OUString, ::rtl::Reference 
NameSpaceEntry , rtl::OUStringHash, OUStringEqFunc  NameSpaceHash;
 typedef ::std::map  sal_uInt16, ::rtl::Reference  NameSpaceEntry , uInt32lt 
 NameSpaceMap;
 
@@ -100,9 +95,10 @@ class XMLOFF_DLLPUBLIC SvXMLNamespaceMap
 const ::rtl::OUString   sXMLNS;
 const ::rtl::OUString   sEmpty;
 
-NameSpaceHash   aNameHash, aNameCache;
+NameSpaceHash   aNameHash;
+mutable NameSpaceHash   aNameCache;
 NameSpaceMapaNameMap;
-QNameCache  aQNameCache;
+mutable QNameCache  aQNameCache;
 SAL_DLLPRIVATE sal_uInt16 _Add( const rtl::OUString rPrefix, const 
rtl::OUString rName, sal_uInt16 nKey );
 
 public:
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index 383df82..06e6caa 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -26,6 +26,8 @@
  *
  /
 
+#include sal/config.h
+
 #include tools/debug.hxx
 #include rtl/ustring.hxx
 #include rtl/ustrbuf.hxx
@@ -75,13 +77,6 @@ void SvXMLNamespaceMap::operator=( const SvXMLNamespaceMap 
rMap )
 
 SvXMLNamespaceMap::~SvXMLNamespaceMap()
 {
-QNameCache::iterator aIter = aQNameCache.begin(), aEnd = aQNameCache.end();
-while ( aIter != aEnd )
-{
-const OUString *pString = (*aIter).first.second;
-++aIter;
-delete pString;
-}
 }
 
 int SvXMLNamespaceMap::operator ==( const SvXMLNamespaceMap rCmp ) const
@@ -243,7 +238,7 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey,
 {
 QNameCache::const_iterator aQCacheIter;
 if (bCache)
-aQCacheIter = aQNameCache.find ( QNamePair ( nKey, rLocalName 
) );
+aQCacheIter = aQNameCache.find ( QNamePair ( nKey, rLocalName 
) );
 else
 aQCacheIter = aQNameCache.end();
 if ( aQCacheIter != aQNameCache.end() )
@@ -265,8 +260,9 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey,
 if (bCache)
 {
 OUString sString(sQName.makeStringAndClear());
-OUString *pString = new OUString ( rLocalName );
-const_cast  QNameCache *  (aQNameCache)-operator[] 
( QNamePair ( nKey, pString ) ) = sString;
+aQNameCache.insert(
+QNameCache::value_type(
+QNamePair(nKey, rLocalName), sString));
 return sString;
 }
 else
@@ -357,10 +353,9 @@ sal_uInt16 SvXMLNamespaceMap::_GetKeyByAttrName( const 
OUString rAttrName,
 nKey = xEntry-nKey = XML_NAMESPACE_NONE;
 
 if (bCache)
-{
-typedef std::pair const rtl::OUString, rtl::ReferenceNameSpaceEntry 
 value_type;
-(void) const_castNameSpaceHash*(aNameCache)-insert (value_type 
(rAttrName, xEntry));
-}
+{
+aNameCache.insert(NameSpaceHash::value_type(rAttrName, xEntry));
+}
 }
 
 return nKey;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org

[Libreoffice-commits] .: vcl/inc vcl/win

[Ivan Timofeev]

 vcl/inc/win/saldata.hxx|1 -
 vcl/win/source/gdi/salgdi3.cxx |   39 ---
 2 files changed, 40 deletions(-)

New commits:
commit c1d04217e87e175017898f918cd77fe6529ec0da
Author: Christina Rossmanith chrrossman...@web.de
Date:   Tue Jan 31 11:40:22 2012 +0100

Removed unused ImplSalLogFontToFontA()

diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index 2d6bbf1..cc3a9e4 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -239,7 +239,6 @@ sal_Bool ImplSalPreDispatchMsg( MSG* pMsg );
 void ImplSalPostDispatchMsg( MSG* pMsg, LRESULT nDispatchResult );
 
 // \WIN\SOURCE\GDI\SALGDI3.CXX
-void ImplSalLogFontToFontA( HDC hDC, const LOGFONTA rLogFont, Font rFont );
 void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW rLogFont, Font rFont );
 bool ImplIsFontAvailable( HDC hDC, const UniString rName );
 
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 6b6b917..692005d 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -1011,45 +1011,6 @@ static ImplWinFontData* ImplLogMetricToDevFontDataW( 
const ENUMLOGFONTEXW* pLogF
 
 // ---
 
-void ImplSalLogFontToFontA( HDC hDC, const LOGFONTA rLogFont, Font rFont )
-{
-String aFontName( ImplSalGetUniString( rLogFont.lfFaceName ) );
-if ( aFontName.Len() )
-{
-rFont.SetName( aFontName );
-rFont.SetCharSet( ImplCharSetToSal( rLogFont.lfCharSet ) );
-rFont.SetFamily( ImplFamilyToSal( rLogFont.lfPitchAndFamily ) );
-rFont.SetPitch( ImplLogPitchToSal( rLogFont.lfPitchAndFamily ) );
-rFont.SetWeight( ImplWeightToSal( rLogFont.lfWeight ) );
-
-long nFontHeight = rLogFont.lfHeight;
-if ( nFontHeight  0 )
-nFontHeight = -nFontHeight;
-long nDPIY = GetDeviceCaps( hDC, LOGPIXELSY );
-if( !nDPIY )
-nDPIY = 600;
-nFontHeight *= 72;
-nFontHeight += nDPIY/2;
-nFontHeight /= nDPIY;
-rFont.SetSize( Size( 0, nFontHeight ) );
-rFont.SetOrientation( (short)rLogFont.lfEscapement );
-if ( rLogFont.lfItalic )
-rFont.SetItalic( ITALIC_NORMAL );
-else
-rFont.SetItalic( ITALIC_NONE );
-if ( rLogFont.lfUnderline )
-rFont.SetUnderline( UNDERLINE_SINGLE );
-else
-rFont.SetUnderline( UNDERLINE_NONE );
-if ( rLogFont.lfStrikeOut )
-rFont.SetStrikeout( STRIKEOUT_SINGLE );
-else
-rFont.SetStrikeout( STRIKEOUT_NONE );
-}
-}
-
-// ---
-
 void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW rLogFont, Font rFont )
 {
 XubString aFontName( reinterpret_castconst 
xub_Unicode*(rLogFont.lfFaceName) );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

[Noel Power]

 sw/source/core/layout/pagechg.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b446a1fb30b5a7097824acfe6143f4284b03
Author: Andreas Schierl openoff...@schierla.de
Date:   Mon Jan 30 23:34:56 2012 +0100

ClrContourCache for SwAnchoredDrawObjects

diff --git a/sw/source/core/layout/pagechg.cxx 
b/sw/source/core/layout/pagechg.cxx
index 55fdefe..4b7092b 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -2035,6 +2035,9 @@ void lcl_MoveAllLowerObjs( SwFrm* pFrm, const Point 
rOffset )
 const Point aNewAnchorPos( ( aCurrAnchorPos + rOffset ) );
 pAnchoredDrawObj-DrawObj()-SetAnchorPos( aNewAnchorPos );
 pAnchoredDrawObj-SetLastObjRect( 
pAnchoredDrawObj-GetObjRect().SVRect() );
+
+// clear contour cache
+ClrContourCache( pAnchoredDrawObj-GetDrawObj() );
 }
 // #i92511#
 // cache for object rectangle inclusive spaces has to be invalidated.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

[Stephan Bergmann]

 solenv/gbuild/TargetLocations.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4171501c49e345266e892e35e6c224deb1b34f55
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jan 31 12:50:52 2012 +0100

Avoid trailing slashes in xsltproc schemaRoot param

...as some xslt procs are confused by paths containing // IIRC
and that would explain a Win-x86@7-MinGW tinderbox failure.

diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index b49f890..4dabdac 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -49,7 +49,8 @@ gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar
 gb_Zip_get_outdir_target = $(OUTDIR)/pck/$(1).zip
 # outdir targets: $(1) is path
 gb_Configuration_registry = $(OUTDIR)/xml/registry
-gb_XcsTarget_get_outdir_target = $(gb_Configuration_registry)/schema/$(1)
+gb_XcsTarget_get_outdir_target = \
+$(gb_Configuration_registry)/schema$(if $(1),/)$(1)
 gb_XcuDataTarget_get_outdir_target = $(gb_Configuration_registry)/data/$(1)
 gb_XcuLangpackTarget_get_outdir_target = 
$(gb_Configuration_registry)/spool/$(1)
 gb_XcuModuleTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 sc/source/ui/namedlg/namedefdlg.cxx |2 -
 sc/source/ui/src/namedefdlg.src |   56 ++--
 sc/source/ui/src/namedlg.src|   52 -
 3 files changed, 55 insertions(+), 55 deletions(-)

New commits:
commit 03e1564c1e306bcdcd6802d6ad09252e36cb51b5
Author: Stefan Knorr (astron) heinzless...@gmail.com
Date:   Thu Jan 26 14:36:16 2012 +0100

Make named ranges dialog more consistent, localizable (I+II+III)

Signed-off-by: Petr Mladek pmla...@suse.cz
Signed-off-by: Noel Power nopo...@suse.com
Signed-off-by: Andras Timar ati...@suse.com

diff --git a/sc/source/ui/namedlg/namedefdlg.cxx 
b/sc/source/ui/namedlg/namedefdlg.cxx
index 9f87047..45c600b 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -345,7 +345,7 @@ void ScNameDefDlg::MorePushed()
 Size nSize = GetSizePixel();
 
 //depending on the state of the button, move all elements below up/down
-long nPixel = 75;
+long nPixel = 65;
 if (!maBtnMore.GetState())
 {
 nPixel *= -1;
diff --git a/sc/source/ui/src/namedefdlg.src b/sc/source/ui/src/namedefdlg.src
index 42538dd..2bf1926 100644
--- a/sc/source/ui/src/namedefdlg.src
+++ b/sc/source/ui/src/namedefdlg.src
@@ -34,118 +34,118 @@ ModelessDialog RID_SCDLG_NAMES_DEFINE
 HelpId = CMD_FID_ADD_NAME ;
 Hide = TRUE ;
 SVLook = TRUE ;
-Size = MAP_APPFONT ( 200 , 120 ) ;
+Size = MAP_APPFONT ( 225 , 116 ) ;
 Text [ en-US ] = Define Name ;
 Moveable = TRUE ;
 Closeable = TRUE;
 PushButton BTN_ADD
 {
-Pos = MAP_APPFONT( 90, 100 );
+Pos = MAP_APPFONT( 115, 96 );
 Size = MAP_APPFONT( 50, 15 );
 TabStop = TRUE;
 Text [en-US] = Add;
 };
 PushButton BTN_CANCEL
 {
-Pos = MAP_APPFONT( 145, 100 );
+Pos = MAP_APPFONT( 170, 96 );
 Size = MAP_APPFONT ( 50, 15 );
 TabStop = TRUE;
 Text [en-US] = Cancel;
 };
 CheckBox BTN_MORE
 {
-Pos = MAP_APPFONT( 5, 82 );
+Pos = MAP_APPFONT( 5, 81 );
 Size = MAP_APPFONT( 80, 15 );
 Text [en-US] = Range Options;
 };
 FixedText FT_INFO
 {
 Pos = MAP_APPFONT( 5, 5 );
-Size = MAP_APPFONT( 180, 15 );
+Size = MAP_APPFONT( 215, 15 );
 };
 FixedText FT_NAME
 {
-Pos = MAP_APPFONT( 5, 25 );
-Size = MAP_APPFONT( 30, 15 );
+Pos = MAP_APPFONT( 5, 27 );
+Size = MAP_APPFONT( 50, 13 );
 Text [en-US] = Name;
 };
 FixedText FT_RANGE
 {
 Pos = MAP_APPFONT( 5, 45 );
-Size = MAP_APPFONT( 30, 15 );
+Size = MAP_APPFONT( 50, 13 );
 Text [en-US] = Range;
 };
 FixedText FT_SCOPE
 {
-Pos = MAP_APPFONT( 5, 65 );
-Size = MAP_APPFONT( 30, 15 );
+Pos = MAP_APPFONT( 5, 63 );
+Size = MAP_APPFONT( 50, 13 );
 Text [en-US] = Scope;
 };
 Edit ED_NAME
 {
 Border = TRUE;
-Pos = MAP_APPFONT( 40, 25 );
-Size = MAP_APPFONT( 155, 15 );
+Pos = MAP_APPFONT( 60, 25 );
+Size = MAP_APPFONT( 160, 13 );
 TabStop = TRUE;
 };
 Edit ED_RANGE
 {
 Border = TRUE;
-Pos = MAP_APPFONT( 40, 45 );
-Size = MAP_APPFONT( 140, 15 );
+Pos = MAP_APPFONT( 60, 43 );
+Size = MAP_APPFONT( 145, 13 );
 TabStop = TRUE;
 };
 ImageButton RB_RANGE
 {
-Pos = MAP_APPFONT ( 180 , 45 ) ;
-Size = MAP_APPFONT ( 15 , 15 ) ;
+Pos = MAP_APPFONT ( 205 , 43 ) ;
+Size = MAP_APPFONT ( 15 , 13 ) ;
 TabStop = TRUE ;
 QuickHelpText [ en-US ] = Shrink ;
 };
 CheckBox BTN_PRINTAREA
 {
 HelpID = sc:CheckBox:RID_SCDLG_NAMES:BTN_PRINTAREA;
-Pos = MAP_APPFONT ( 5 , 100 ) ;
-Size = MAP_APPFONT ( 80 , 15 ) ;
+Pos = MAP_APPFONT ( 5 , 94 ) ;
+Size = MAP_APPFONT ( 90 , 10 ) ;
 Text [ en-US ] = ~Print range ;
 TabStop = TRUE ;
 };
 CheckBox BTN_CRITERIA
 {
 HelpID = sc:CheckBox:RID_SCDLG_NAMES:BTN_CRITERIA;
-Pos = MAP_APPFONT ( 5 , 120 ) ;
-Size = MAP_APPFONT ( 60 , 15 ) ;
+Pos = MAP_APPFONT ( 5 , 107 ) ;
+Size = MAP_APPFONT ( 70 , 10 ) ;
 Text [ en-US ] = ~Filter ;
 TabStop = TRUE ;
 };
 CheckBox BTN_ROWHEADER
 {
 HelpID = sc:CheckBox:RID_SCDLG_NAMES:BTN_ROWHEADER;
-Pos = MAP_APPFONT ( 110, 120 ) ;
-Size = MAP_APPFONT ( 82 , 15 ) ;
+Pos = MAP_APPFONT ( 120, 107 ) ;
+Size = MAP_APPFONT ( 92 , 10 ) ;
 Text [ en-US ] = Repeat ~row ;
 TabStop = TRUE ;
 };
 CheckBox BTN_COLHEADER
 {
 HelpID = sc:CheckBox:RID_SCDLG_NAMES:BTN_COLHEADER;
-Pos = MAP_APPFONT ( 110 , 100 ) ;
-Size = MAP_APPFONT ( 82 , 15 ) ;
+Pos = MAP_APPFONT ( 120 , 94 ) ;
+Size = MAP_APPFONT ( 92 

[Libreoffice-commits] .: Branch 'feature/android' - 3 commits - android/Bootstrap sal/osl

[Tor Lillqvist]

 android/Bootstrap/src/org/libreoffice/android/Bootstrap.java |8 
 sal/osl/unx/file_misc.cxx|8 
 2 files changed, 4 insertions(+), 12 deletions(-)

New commits:
commit 73a47ed3750bde3de1f8abcf0005ee068b1ed96e
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Tue Jan 31 14:06:37 2012 +0200

Set TMPDIR for osl_getTempDirURL()

diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java 
b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
index a51315b..ac5d027 100644
--- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
+++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
@@ -143,6 +143,9 @@ public class Bootstrap extends NativeActivity
 argv = Arrays.copyOfRange(argv, 1, argv.length-1);
 }
 
+// TMPDIR is used by osl_getTempDirURL()
+putenv(TMPDIR= + getCacheDir().getAbsolutePath());
+
 // argv[0] will be replaced by android_main() in lo-bootstrap.c by the
 // pathname of the mainLibrary.
 String[] newargv = new String[argv.length + 1];
commit 427edef2c780b40513af0491d5cbe865233d0650
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Tue Jan 31 13:57:11 2012 +0200

putenv() does seem to be process-wide

diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java 
b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
index 9e21056..a51315b 100644
--- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
+++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
@@ -136,10 +136,7 @@ public class Bootstrap extends NativeActivity
 
 String[] argv = CommandLine.split(cmdLine);
 
-// Handle env var assignments in the command line. Actually
-// not sure if this works, are environments per-thread in
-// Android? This code runs in a different thread than that in
-// which lo_main etc will run.
+// Handle env var assignments in the command line.
 while (argv.length  0 
argv[0].matches([A-Z_]+=.*)) {
 putenv(argv[0]);
commit 299fa646833c1e00448a039f57510a76c6cbb250
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Tue Jan 31 13:53:12 2012 +0200

No need to wait for debugger here on Android, this code does seem to work

diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index 962d7bf..edd4eec 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -1055,14 +1055,6 @@ static int oslDoCopyFile(const sal_Char* 
pszSourceFileName, const sal_Char* pszD
 int DestFileFD=0;
 int nRet=0;
 
-#ifdef ANDROID
-volatile int beenhere = 0;
-if (!beenhere) {
-beenhere++;
-fprintf(stderr, Sleeping NOW, start ndk-gdb!\n);
-::sleep(20);
-}
-#endif
 if (osl_openFilePath(pszSourceFileName,
  SourceFileFH,
  
osl_File_OpenFlag_Read|osl_File_OpenFlag_NoLock|osl_File_OpenFlag_NoExcl) != 
osl_File_E_None)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Power]

 sc/inc/scdll.hxx  |1 
 sc/source/core/inc/ddelink.hxx|1 
 sc/source/core/tool/ddelink.cxx   |   11 -
 sc/source/ui/app/scdll.cxx|   10 
 sc/source/ui/dbgui/fieldwnd.cxx   |5 
 sc/source/ui/inc/areasave.hxx |1 
 sc/source/ui/inc/cellmergeoption.hxx  |1 
 sc/source/ui/inc/fieldwnd.hxx |1 
 sc/source/ui/inc/scuitphfedit.hxx |4 ---
 sc/source/ui/pagedlg/scuitphfedit.cxx |   39 --
 sc/source/ui/undo/areasave.cxx|5 
 sc/source/ui/view/cellmergeoption.cxx |9 ---
 unusedcode.easy   |9 ---
 13 files changed, 97 deletions(-)

New commits:
commit 9c66fca6ceaa3ba4ad79264a56a992828a92f536
Author: Elton Chung el...@elton.tk
Date:   Tue Jan 31 12:36:47 2012 +

Remove unsed code

diff --git a/sc/inc/scdll.hxx b/sc/inc/scdll.hxx
index 93cff7e..43a9c9f 100644
--- a/sc/inc/scdll.hxx
+++ b/sc/inc/scdll.hxx
@@ -61,7 +61,6 @@ public:
 
 // DLL-init/exit-code must be linked to the DLL only
 static void Init(); // called directly after loading the DLL
-static void Exit(); // called directly befor unloading the DLL
 
 static sal_uLongDetectFilter( SfxMedium rMedium, const SfxFilter** 
ppFilter,
 SfxFilterFlags nMust, SfxFilterFlags nDont 
);
diff --git a/sc/source/core/inc/ddelink.hxx b/sc/source/core/inc/ddelink.hxx
index e3794e4..216d6d6 100644
--- a/sc/source/core/inc/ddelink.hxx
+++ b/sc/source/core/inc/ddelink.hxx
@@ -87,7 +87,6 @@ public:
 const String   GetItem() const { return aItem; }
 sal_uInt8   GetMode() const { return nMode; }
 
-voidResetValue();   // Wert zuruecksetzen
 voidTryUpdate();
 
 sal_BoolNeedsUpdate() const { return bNeedUpdate; }
diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx
index 3bd75ae..5d36e52 100644
--- a/sc/source/core/tool/ddelink.cxx
+++ b/sc/source/core/tool/ddelink.cxx
@@ -228,17 +228,6 @@ sfx2::SvBaseLink::UpdateResult ScDdeLink::DataChanged(
 return SUCCESS;
 }
 
-void ScDdeLink::ResetValue()
-{
-pResult.reset();
-
-//  Es hat sich was getan...
-//  Tracking, FID_DATACHANGED etc. passiert von aussen
-
-if (HasListeners())
-Broadcast( ScHint( SC_HINT_DATACHANGED, ScAddress(), NULL ) );
-}
-
 void ScDdeLink::ListenersGone()
 {
 sal_Bool bWas = bIsInUpdate;
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 9cf9555..0a57bf6 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -312,16 +312,6 @@ void ScDLL::Init()
 //  StarOne Services are now handled in the registry
 }
 
-void ScDLL::Exit()
-{
-// the SxxModule must be destroyed
-ScModule **ppShlPtr = (ScModule**) GetAppData(SHL_CALC);
-delete (*ppShlPtr);
-(*ppShlPtr) = NULL;
-
-//  ScGlobal::Clear ist schon im Module-dtor
-}
-
 //--
 //  Statusbar
 //--
diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx
index 40eb873..9139be4 100644
--- a/sc/source/ui/dbgui/fieldwnd.cxx
+++ b/sc/source/ui/dbgui/fieldwnd.cxx
@@ -254,11 +254,6 @@ size_t ScDPFieldControlBase::GetSelectedField() const
 return mnFieldSelected;
 }
 
-void ScDPFieldControlBase::SetSelectedField(size_t nSelected)
-{
-mnFieldSelected = nSelected;
-}
-
 vectorScDPFieldControlBase::FieldName ScDPFieldControlBase::GetFieldNames()
 {
 return maFieldNames;
diff --git a/sc/source/ui/inc/areasave.hxx b/sc/source/ui/inc/areasave.hxx
index c9ff348..1a0b1cd 100644
--- a/sc/source/ui/inc/areasave.hxx
+++ b/sc/source/ui/inc/areasave.hxx
@@ -78,7 +78,6 @@ public:
 
 const ScAreaLinkSaver* operator[](size_t nIndex) const;
 size_t size() const;
-void clear();
 void push_back(ScAreaLinkSaver* p);
 };
 
diff --git a/sc/source/ui/inc/cellmergeoption.hxx 
b/sc/source/ui/inc/cellmergeoption.hxx
index ad5fe34..62e4279 100644
--- a/sc/source/ui/inc/cellmergeoption.hxx
+++ b/sc/source/ui/inc/cellmergeoption.hxx
@@ -44,7 +44,6 @@ struct ScCellMergeOption
 SCROW mnEndRow;
 bool mbCenter;
 
-explicit ScCellMergeOption();
 explicit ScCellMergeOption(const ScRange rRange);
 explicit ScCellMergeOption(SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow,
diff --git a/sc/source/ui/inc/fieldwnd.hxx b/sc/source/ui/inc/fieldwnd.hxx
index 2b232cf..49fc2ed 100644
--- a/sc/source/ui/inc/fieldwnd.hxx
+++ b/sc/source/ui/inc/fieldwnd.hxx
@@ -149,7 +149,6 @@ public:
 voidGetExistingIndex( const Point rPos, size_t rnIndex );
 
 size_t GetSelectedField() const;
-void SetSelectedField(size_t nSelected);
 
 /** Selects the next field. Called i.e. after 

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

[Noel Power]

 sd/inc/cusshow.hxx   |   14 +-
 sd/source/core/cusshow.cxx   |   28 ++--
 sd/source/core/drawdoc_animations.cxx|3 ++-
 sd/source/filter/ppt/pptin.cxx   |2 +-
 sd/source/ui/dlg/custsdlg.cxx|   26 +-
 sd/source/ui/dlg/sdtreelb.cxx|4 ++--
 sd/source/ui/slideshow/slideshowimpl.cxx |   10 +-
 sd/source/ui/unoidl/unocpres.cxx |   16 ++--
 8 files changed, 52 insertions(+), 51 deletions(-)

New commits:
commit 5a71069339b3a3c118f3015d978799ef66db7564
Author: Noel Grandin n...@peralex.com
Date:   Tue Jan 31 14:16:38 2012 +

convert SdCustomeShow from tools/list to vector

diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx
index 1f981e9..1bd3614 100644
--- a/sd/inc/cusshow.hxx
+++ b/sd/inc/cusshow.hxx
@@ -29,7 +29,7 @@
 #ifndef _SD_CUSSHOW_HXX
 #define _SD_CUSSHOW_HXX
 
-#include tools/list.hxx
+#include vector
 #include tools/stream.hxx
 #include tools/string.hxx
 #include cppuhelper/weakref.hxx
@@ -43,9 +43,13 @@ class SdPage;
 |* CustomShow
 |*
 \/
-class SD_DLLPUBLIC SdCustomShow : public List
+class SD_DLLPUBLIC SdCustomShow
 {
+public:
+typedef ::std::vectorconst SdPage* PageVec;
+
 private:
+PageVec   maPages;
 String  aName;
 SdDrawDocument* pDoc;
 
@@ -65,14 +69,14 @@ public:
 // @@@ copy ctor, but no copy assignment? @@@
 SdCustomShow( const SdCustomShow rShow );
 
+PageVec PagesVector();
+void ReplacePage( const SdPage* pOldPage, const SdPage* pNewPage );
+
 void   SetName(const String rName);
 String GetName() const;
 
 SdDrawDocument* GetDoc() const { return pDoc; }
 
-void ReplacePage( const SdPage* pOldPage, const SdPage* pNewPage );
-void RemovePage( const SdPage* pPage );
-
 ::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface  
getUnoCustomShow();
 };
 
diff --git a/sd/source/core/cusshow.cxx b/sd/source/core/cusshow.cxx
index c604344..dcdb343 100644
--- a/sd/source/core/cusshow.cxx
+++ b/sd/source/core/cusshow.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star;
 |*
 \/
 SdCustomShow::SdCustomShow(SdDrawDocument* pDrawDoc)
-  : List(),
+  : maPages(),
   pDoc(pDrawDoc)
 {
 }
@@ -56,14 +56,14 @@ SdCustomShow::SdCustomShow(SdDrawDocument* pDrawDoc)
 |*
 \/
 SdCustomShow::SdCustomShow( const SdCustomShow rShow )
-: List( rShow )
+: maPages(rShow.maPages)
 {
 aName = rShow.GetName();
 pDoc = rShow.GetDoc();
 }
 
 SdCustomShow::SdCustomShow(SdDrawDocument* pDrawDoc, 
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface  xShow )
-  : List(),
+  : maPages(),
   pDoc(pDrawDoc),
   mxUnoCustomShow( xShow )
 {
@@ -97,28 +97,20 @@ uno::Reference uno::XInterface  
SdCustomShow::getUnoCustomShow()
 return xShow;
 }
 
+SdCustomShow::PageVec SdCustomShow::PagesVector()
+{
+return maPages;
+}
+
 void SdCustomShow::ReplacePage( const SdPage* pOldPage, const SdPage* pNewPage 
)
 {
 if( !pNewPage )
 {
-RemovePage( pOldPage );
+::std::remove(maPages.begin(), maPages.end(), pOldPage);
 }
 else
 {
-sal_uLong nPos;
-while( (nPos = GetPos( (void*)pOldPage )) != CONTAINER_ENTRY_NOTFOUND  
)
-{
-Replace( (void*)pNewPage, nPos );
-}
-}
-}
-
-void SdCustomShow::RemovePage( const SdPage* pPage )
-{
-sal_uLong nPos;
-while( (nPos = GetPos( (void*)pPage )) != CONTAINER_ENTRY_NOTFOUND  )
-{
-Remove( nPos );
+::std::replace(maPages.begin(), maPages.end(), pOldPage, pNewPage);
 }
 }
 
diff --git a/sd/source/core/drawdoc_animations.cxx 
b/sd/source/core/drawdoc_animations.cxx
index 5b41d0c..de62ec5 100644
--- a/sd/source/core/drawdoc_animations.cxx
+++ b/sd/source/core/drawdoc_animations.cxx
@@ -44,7 +44,8 @@ void SdDrawDocument::ReplacePageInCustomShows( const SdPage* 
pOldPage, const SdP
 {
 SdCustomShow* pCustomShow = (SdCustomShow*) 
mpCustomShowList-GetObject(i);
 if( pNewPage == 0 )
-pCustomShow-RemovePage(pOldPage);
+::std::remove(pCustomShow-PagesVector().begin(), 
pCustomShow-PagesVector().end(),
+pOldPage);
 else
 pCustomShow-ReplacePage(pOldPage,pNewPage);
 }
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 203d2f3..af5dd14 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1301,7 +1301,7 @@ sal_Bool ImplSdPPTImport::Import()
 SdPage* pPage = 
mpDoc-GetSdPage( nPage, PK_STANDARD );
 if ( pPage )

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

[Petr Mladek]

 sw/source/core/fields/reffld.cxx |   39 ---
 1 file changed, 24 insertions(+), 15 deletions(-)

New commits:
commit 4925acf5648438589bca74f3dbfc2fc5fc9f61ab
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date:   Mon Jan 30 11:35:42 2012 +0100

fdo#35669: more robust references merging
(cherry picked from commit 458d56d9b35f2ecb2eea2589737079390b10ee26)

Signed-off-by: Michael Stahl mst...@redhat.com
Signed-off-by: Noel Power nopo...@suse.com
Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index c15c542..eca22ba 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -974,11 +974,13 @@ void _RefIdsMap::Init( SwDoc rDoc, SwDoc rDestDoc, 
sal_Bool bField )
 GetFieldIdsFromDoc( rDoc, aDstIds );
 
 // Define the mappings now
-sal_uInt16 nMaxDstId = *aIds.end();
+sal_uInt16 nMaxDstId = -1;
+if ( !aIds.empty() )
+nMaxDstId = *aIds.rbegin();
 
 // Map all the src fields to their value + nMaxDstId
 for ( std::setsal_uInt16::iterator pIt = aDstIds.begin(); pIt != 
aDstIds.end(); ++pIt )
-AddId( nMaxDstId++, *pIt );
+AddId( ++nMaxDstId, *pIt );
 
 // Change the Sequence number of all the SetExp fields in the 
destination document
 SwFieldType* pType = rDoc.GetFldType( RES_SETEXPFLD, aName, false );
commit 4632a18dae5e1770aa1da4ac55719a09c1ae461b
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date:   Thu Jan 26 15:30:01 2012 +0100

fdo#35669: properly merge ref fields in master documents
(cherry picked from commit 5e51960dede5015b862df05b7b16f02884647889)

Signed-off-by: Michael Stahl mst...@redhat.com
Signed-off-by: Noel Power nopo...@suse.com
Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 98111d0..c15c542 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -972,6 +972,26 @@ void _RefIdsMap::Init( SwDoc rDoc, SwDoc rDestDoc, 
sal_Bool bField )
 {
 GetFieldIdsFromDoc( rDestDoc, aIds );
 GetFieldIdsFromDoc( rDoc, aDstIds );
+
+// Define the mappings now
+sal_uInt16 nMaxDstId = *aIds.end();
+
+// Map all the src fields to their value + nMaxDstId
+for ( std::setsal_uInt16::iterator pIt = aDstIds.begin(); pIt != 
aDstIds.end(); ++pIt )
+AddId( nMaxDstId++, *pIt );
+
+// Change the Sequence number of all the SetExp fields in the 
destination document
+SwFieldType* pType = rDoc.GetFldType( RES_SETEXPFLD, aName, false );
+if( pType )
+{
+SwIteratorSwFmtFld,SwFieldType aIter( *pType );
+for( SwFmtFld* pF = aIter.First(); pF; pF = aIter.Next() )
+if( pF-GetTxtFld() )
+{
+sal_uInt16 n = 
((SwSetExpField*)pF-GetFld())-GetSeqNumber( );
+((SwSetExpField*)pF-GetFld())-SetSeqNumber( 
sequencedIds[ n ] );
+}
+}
 }
 else
 {
@@ -1030,21 +1050,8 @@ void _RefIdsMap::Check( SwDoc rDoc, SwDoc rDestDoc, 
SwGetRefField rFld,
 AddId( n, nSeqNo );
 rFld.SetSeqNo( n );
 
-// und noch die Felder oder Fuss-/EndNote auf die neue
-// Id umsetzen
-if( bField )
-{
-SwFieldType* pType = rDoc.GetFldType( RES_SETEXPFLD, aName, 
false );
-if( pType )
-{
-SwIteratorSwFmtFld,SwFieldType aIter( *pType );
-for( SwFmtFld* pF = aIter.First(); pF; pF = aIter.Next() )
-if( pF-GetTxtFld()  nSeqNo ==
-((SwSetExpField*)pF-GetFld())-GetSeqNumber() )
-((SwSetExpField*)pF-GetFld())-SetSeqNumber( n );
-}
-}
-else
+// und noch die Fuss-/EndNote auf die neue Id umsetzen
+if( !bField )
 {
 SwTxtFtn* pFtnIdx;
 for( sal_uInt16 i = 0, nCnt = rDoc.GetFtnIdxs().Count(); i  
nCnt; ++i )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

[Noel Power]

 sw/source/core/layout/pagechg.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 84370b807279cd8336c3e77278bae42b904324b4
Author: Andreas Schierl openoff...@schierla.de
Date:   Tue Jan 31 14:29:32 2012 +

only call ClrContour for contour wrapped drawing objects

diff --git a/sw/source/core/layout/pagechg.cxx 
b/sw/source/core/layout/pagechg.cxx
index 4b7092b..403f64d 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -39,6 +39,7 @@
 #include fmtfordr.hxx
 #include fmtfld.hxx
 #include fmtornt.hxx
+#include fmtsrnd.hxx
 #include ftninfo.hxx
 #include tgrditem.hxx
 #include viewopt.hxx
@@ -2037,7 +2038,8 @@ void lcl_MoveAllLowerObjs( SwFrm* pFrm, const Point 
rOffset )
 pAnchoredDrawObj-SetLastObjRect( 
pAnchoredDrawObj-GetObjRect().SVRect() );
 
 // clear contour cache
-ClrContourCache( pAnchoredDrawObj-GetDrawObj() );
+if ( pAnchoredDrawObj-GetFrmFmt().GetSurround().IsContour() )
+ClrContourCache( pAnchoredDrawObj-GetDrawObj() );
 }
 // #i92511#
 // cache for object rectangle inclusive spaces has to be invalidated.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: comphelper/inc comphelper/Library_comphelp.mk comphelper/Package_inc.mk comphelper/source cui/source officecfg/prj officecfg/registry sfx2/source svl/source unotools/inc unoto

[Stephan Bergmann]

 comphelper/Library_comphelp.mk  |1 
 comphelper/Package_inc.mk   |1 
 comphelper/inc/comphelper/configuration.hxx |  353 
 comphelper/source/misc/configuration.cxx|  233 ++
 cui/source/options/fontsubs.cxx |4 
 cui/source/options/optmemory.cxx|4 
 officecfg/prj/build.lst |2 
 officecfg/registry/cppheader.xsl|   10 
 sfx2/source/appl/appbas.cxx |4 
 sfx2/source/appl/appcfg.cxx |4 
 svl/source/config/asiancfg.cxx  |6 
 unotools/Library_utl.mk |1 
 unotools/Package_inc.mk |1 
 unotools/inc/unotools/configuration.hxx |  353 
 unotools/source/config/configuration.cxx|  232 --
 15 files changed, 605 insertions(+), 604 deletions(-)

New commits:
commit ca3e3e7e3198f492b2d4608ffc5420e657d99b00
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jan 31 15:36:49 2012 +0100

Move unotools/configuration.hxx to comphelper

...so that other code in comphelper can use it.

diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk
index 7534de6..2b37596 100644
--- a/comphelper/Library_comphelp.mk
+++ b/comphelper/Library_comphelp.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\
 comphelper/source/misc/componentbase \
 comphelper/source/misc/componentcontext \
 comphelper/source/misc/componentmodule \
+comphelper/source/misc/configuration \
 comphelper/source/misc/configurationhelper \
 comphelper/source/misc/docpasswordhelper \
 comphelper/source/misc/docpasswordrequest \
diff --git a/comphelper/Package_inc.mk b/comphelper/Package_inc.mk
index ba1344a..7ed759b 100644
--- a/comphelper/Package_inc.mk
+++ b/comphelper/Package_inc.mk
@@ -130,6 +130,7 @@ $(eval $(call 
gb_Package_add_file,comphelper_inc,inc/comphelper/seqstream.hxx,co
 $(eval $(call 
gb_Package_add_file,comphelper_inc,inc/comphelper/namecontainer.hxx,comphelper/namecontainer.hxx))
 $(eval $(call 
gb_Package_add_file,comphelper_inc,inc/comphelper/processfactory.hxx,comphelper/processfactory.hxx))
 $(eval $(call 
gb_Package_add_file,comphelper_inc,inc/comphelper/sequenceashashmap.hxx,comphelper/sequenceashashmap.hxx))
+$(eval $(call 
gb_Package_add_file,comphelper_inc,inc/comphelper/configuration.hxx,comphelper/configuration.hxx))
 $(eval $(call 
gb_Package_add_file,comphelper_inc,inc/comphelper/configurationhelper.hxx,comphelper/configurationhelper.hxx))
 
 # vim: set noet sw=4 ts=4:
diff --git a/comphelper/inc/comphelper/configuration.hxx 
b/comphelper/inc/comphelper/configuration.hxx
new file mode 100644
index 000..85f45f9
--- /dev/null
+++ b/comphelper/inc/comphelper/configuration.hxx
@@ -0,0 +1,353 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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., Stephan Bergmann sberg...@redhat.com
+ * (initial developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the GPLv3+), or
+ * the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef INCLUDED_COMPHELPER_CONFIGURATION_HXX
+#define INCLUDED_COMPHELPER_CONFIGURATION_HXX
+
+#include sal/config.h
+
+#include boost/noncopyable.hpp
+#include boost/optional.hpp
+#include boost/shared_ptr.hpp
+#include com/sun/star/uno/Any.hxx
+#include com/sun/star/uno/Reference.hxx
+#include comphelper/comphelperdllapi.h
+#include sal/types.h
+
+namespace com { namespace sun { namespace star {
+namespace configuration { class XReadWriteAccess; }
+namespace container {
+class XHierarchicalNameAccess;
+class XHierarchicalNameReplace;
+class XNameAccess;
+class XNameContainer;
+}
+namespace uno { class XComponentContext; }
+} } }
+namespace rtl { class OUString; }
+
+namespace comphelper {
+
+namespace detail { class ConfigurationWrapper; }
+
+/// A batch of configuration changes that is committed as a whole.
+///
+/// 

[Libreoffice-commits] .: vcl/unx

[Michael Meeks]

 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit a7b44da99409a7a378fb0a6b19961ca30df8d852
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Jan 31 15:21:48 2012 +

gtk3: clobber the page / background color to white for now.

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index cc764da..95aa313 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1174,15 +1174,24 @@ void GtkSalGraphics::updateSettings( AllSettings 
rSettings )
 // background colors
 GdkRGBA background_color;
 gtk_style_context_get_background_color(pStyle, GTK_STATE_FLAG_NORMAL, 
background_color);
+
 ::Color aBackColor = getColor( background_color );
-::Color aBackFieldColor = getColor( background_color  );
 aStyleSet.Set3DColors( aBackColor );
 aStyleSet.SetFaceColor( aBackColor );
 aStyleSet.SetDialogColor( aBackColor );
 aStyleSet.SetWorkspaceColor( aBackColor );
+aStyleSet.SetCheckedColorSpecialCase( );
+
+GdkRGBA field_background_color;
+gtk_style_context_get_background_color(pStyle, GTK_STATE_FLAG_NORMAL, 
field_background_color);
+::Color aBackFieldColor = getColor( field_background_color );
+// FIXME: we really need some work getting the right style contexts.
+// it seems a window has a rather different background color from what we 
want.
+aBackFieldColor = ::Color( COL_WHITE );
 aStyleSet.SetFieldColor( aBackFieldColor );
+// This baby is the default page/paper color
 aStyleSet.SetWindowColor( aBackFieldColor );
-aStyleSet.SetCheckedColorSpecialCase( );
+
 // highlighting colors
 gtk_style_context_get_background_color(pStyle, GTK_STATE_FLAG_SELECTED, 
text_color);
 ::Color aHighlightColor = getColor( text_color );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/android' - 5 commits - android/qa sal/android sal/inc sal/osl sc/qa

[Tor Lillqvist]

 android/qa/sc/Makefile |4 
 sal/android/lo-bootstrap.c |   23 ++-
 sal/inc/osl/detail/android-bootstrap.h |2 ++
 sal/osl/unx/module.c   |4 
 sc/qa/unit/filters-test.cxx|8 ++--
 5 files changed, 38 insertions(+), 3 deletions(-)

New commits:
commit a322022d9a73c31eb26f0752b528e9e866ce6140
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Tue Jan 31 17:28:52 2012 +0200

Move assertions before use

diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 2a0b3e2..8314c8c 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -291,9 +291,11 @@ void ScFiltersTest::testRangeName()
 rtl::OUString aFilterType(aFileFormats[i].pTypeName, 
strlen(aFileFormats[i].pTypeName), RTL_TEXTENCODING_UTF8);
 std::cout  aFileFormats[i].pName   Test  std::endl;
 ScDocShellRef xDocSh = load (aFilterName, aFileName, rtl::OUString(), 
aFilterType, aFileFormats[i].nFormatType);
-xDocSh-DoHardRecalc(true);
 
 CPPUNIT_ASSERT_MESSAGE(Failed to load named-ranges-globals.*, 
xDocSh.Is());
+
+xDocSh-DoHardRecalc(true);
+
 ScDocument* pDoc = xDocSh-GetDocument();
 testRangeNameImpl(pDoc);
 
@@ -357,9 +359,11 @@ void ScFiltersTest::testContent()
 rtl::OUString aFilterType(aFileFormats[i].pTypeName, 
strlen(aFileFormats[i].pTypeName), RTL_TEXTENCODING_UTF8);
 std::cout  aFileFormats[i].pName   Test  std::endl;
 ScDocShellRef xDocSh = load (aFilterName, aFileName, rtl::OUString(), 
aFilterType, aFileFormats[i].nFormatType);
-xDocSh-DoHardRecalc(true);
 
 CPPUNIT_ASSERT_MESSAGE(Failed to load universal-content.*, 
xDocSh.Is());
+
+xDocSh-DoHardRecalc(true);
+
 ScDocument* pDoc = xDocSh-GetDocument();
 testContentImpl(pDoc);
 xDocSh-DoClose();
commit 2b4ceff9384198352df8540df4835379ed8cc23c
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Tue Jan 31 16:21:32 2012 +0200

filters_test needs more libraries now when it proceeds further

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 0412f33..84341ab 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -53,11 +53,13 @@ copy-stuff:
 # Libs and UNO components that the tests need.
 #
for F in $(strip \
+ analysislo \
  basebmplo \
  basegfxlo \
  bootstrap.uno \
  comphelpgcc3 \
  configmgr.uno \
+ expwrap.uno \
  fileacc \
  fontconfig \
  forlo \
@@ -84,6 +86,7 @@ copy-stuff:
  mergedlo \
  msfilterlo \
  ooxlo \
+ reflection.uno \
  reg \
  saxlo \
  sblo \
@@ -115,6 +118,7 @@ copy-stuff:
  xcrlo \
  xml2 \
  xmlreader \
+ xstor \
  ); do \
$(call COPY,$(OUTDIR)/lib/lib$${F}.so); \
done
commit b8ea7cff48e4d10e51bec8f2d595323982d8f51b
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Tue Jan 31 16:20:14 2012 +0200

Call lo_dlclose() on Android

diff --git a/sal/osl/unx/module.c b/sal/osl/unx/module.c
index 792f0cd..d600bb8 100644
--- a/sal/osl/unx/module.c
+++ b/sal/osl/unx/module.c
@@ -236,7 +236,11 @@ void SAL_CALL osl_unloadModule(oslModule hModule)
 if (hModule)
 {
 #ifndef NO_DL_FUNCTIONS
+#ifdef ANDROID
+int nRet = lo_dlclose(hModule);
+#else
 int nRet = dlclose(hModule);
+#endif
 
 #if OSL_DEBUG_LEVEL  1
 if (nRet != 0)
commit 2c11a8fed62ed6b3aefc2a00cc0ae9c40e9b4a94
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Tue Jan 31 16:19:17 2012 +0200

Add lo_dlclose()

diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c
index b9ed8dc..1140515 100644
--- a/sal/android/lo-bootstrap.c
+++ b/sal/android/lo-bootstrap.c
@@ -960,6 +960,19 @@ lo_dladdr(void *addr,
 }
 
 __attribute__ ((visibility(default)))
+int
+lo_dlclose(void *handle)
+{
+/* As we don't know when the reference count for a dlopened shared
+ * object drops to zero, we wouldn't know when to remove it from
+ * our list, so we can't call dlclose().
+ */
+LOGI(lo_dlclose(%p), handle);
+
+return 0;
+}
+
+__attribute__ ((visibility(default)))
 void *
 lo_apkentry(const char *filename,
 size_t *size)
diff --git a/sal/inc/osl/detail/android-bootstrap.h 
b/sal/inc/osl/detail/android-bootstrap.h
index 6539687..bd453b3 100644
--- a/sal/inc/osl/detail/android-bootstrap.h
+++ b/sal/inc/osl/detail/android-bootstrap.h
@@ -51,6 +51,8 @@ void *lo_dlsym(void *handle,
 int lo_dladdr(void *addr,
   Dl_info *info);
 
+int lo_dlclose(void *handle);
+
 void *lo_apkentry(const char *filename,
   size_t *size);
 
commit 

[Libreoffice-commits] .: 5 commits - cli_ure/source odk/configure.pl odk/examples scp2/inc scp2/source

[Andras Timar]

 cli_ure/source/native/native_bootstrap.cxx |8 +-
 odk/configure.pl   |3 
 odk/examples/DevelopersGuide/examples.html |   40 ++---
 scp2/inc/macros.inc|   26 
 scp2/source/ooo/installation_ooo.scp   |1 
 scp2/source/winexplorerext/registryitem_winexplorerext.scp |   12 +--
 6 files changed, 44 insertions(+), 46 deletions(-)

New commits:
commit 797f19ffdaee125726d1db3d230f666093e4b5f8
Author: Andras Timar ati...@suse.com
Date:   Tue Jan 31 16:41:48 2012 +0100

use LibreOffice instead of OpenOffice.org in registry

it may help to solve file association issues, especially when
OpenOffice.org is/was also installed

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index c540495..0ceb511 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -356,7 +356,7 @@ End
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
 Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
-Name = STRING(CONCAT2(OpenOffice.org.,name)); \
+Name = STRING(CONCAT2(LibreOffice.,name)); \
 Value =  ; \
 End
 
@@ -365,7 +365,7 @@ End
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
 Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
-Name = STRING(CONCAT2(OpenOffice.org.,name)); \
+Name = STRING(CONCAT2(LibreOffice.,name)); \
 Value =  ; \
 End
 
@@ -374,7 +374,7 @@ End
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = gid_Module_Root_Reg_##name; \
 Subkey = STRING(CONCAT2(.,key)); \
-Value = STRING(CONCAT2(OpenOffice.org.,name)); \
+Value = STRING(CONCAT2(LibreOffice.,name)); \
 ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
 End
 
@@ -382,7 +382,7 @@ End
 RegistryItem CONCAT2(gid_Regitem_Openoffice_,name) \
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
-Subkey = STRING(CONCAT2(OpenOffice.org.,name)); \
+Subkey = STRING(CONCAT2(LibreOffice.,name)); \
 REG_VALUE_LNG(disp_name) \
 End
 
@@ -390,7 +390,7 @@ End
 RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Defaulticon) \
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
-Subkey = STRING(CONCAT3(OpenOffice.org.,name,\DefaultIcon)); \
+Subkey = STRING(CONCAT3(LibreOffice.,name,\DefaultIcon)); \
 Value = progpath\program\soffice.bin, STRING(icon_id); \
 End
 
@@ -398,7 +398,7 @@ End
 RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell) \
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
-Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell)); \
+Subkey = STRING(CONCAT3(LibreOffice.,name,\shell)); \
 Value = STRING(default); \
 End
 
@@ -406,13 +406,13 @@ End
 RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New) \
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
-Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\new)); \
+Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\new)); \
 REG_VALUE_LNG(NEW) \
 End \
 RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New_Command) \
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
-Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\new\command)); \
+Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\new\command)); \
 Value = \progpath\program\\ STRING(app) \ -n \%1\; \
 End
 
@@ -420,7 +420,7 @@ End
 RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Open_Command) \
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
-Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\open\command)); \
+Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\open\command)); \
 Value = \progpath\program\\ STRING(app) \ -o \%1\; \
 End
 
@@ -428,7 +428,7 @@ End
 RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Print_Command) \
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
-Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\print\command)); \
+Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\print\command)); \
 Value = \progpath\program\\ STRING(app) \ -p \%1\; \
 End
 
@@ -436,7 +436,7 @@ End
 RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Printto_Command) \
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
-Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\printto\command)); 
\
+Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\printto\command)); \
 Value = \progpath\program\\ STRING(app) \ -pt \%2\ \%1\; \
 End
 
@@ -446,7 +446,7 @@ End
 

[Libreoffice-commits] .: wizards/com

[Jan Holesovsky]

 wizards/com/sun/star/wizards/ui/ControlScroller.java |   23 ---
 1 file changed, 23 deletions(-)

New commits:
commit 03e17a141fbb4e1242de9d9979b5b699e6840454
Author: Jan Holesovsky ke...@suse.cz
Date:   Tue Jan 31 17:10:26 2012 +0100

Fix fdo#42543: Don't paint a frame around the list of edit boxes.

This conflicts with commit efc6b840a0423099d6c3e0d33c14d34637fbba4c that
reorders painting of windows when they overlap; and in this case, the frame
image paints over the controls.

The sideeffect is that the dialog looks nicer ;-)

diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java 
b/wizards/com/sun/star/wizards/ui/ControlScroller.java
index c9aeee6..a04d1c1 100644
--- a/wizards/com/sun/star/wizards/ui/ControlScroller.java
+++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java
@@ -39,7 +39,6 @@ public abstract class ControlScroller
 
 protected WizardDialog CurUnoDialog;
 protected XMultiServiceFactory xMSF;
-private Object oImgControl;
 protected int ncurfieldcount;
 protected int nblockincrement;
 private int nlineincrement;
@@ -113,17 +112,6 @@ public abstract class ControlScroller
 int ScrollHeight = iCompHeight - 2;
 nlineincrement = 1;
 sIncSuffix = 
com.sun.star.wizards.common.Desktop.getIncrementSuffix(CurUnoDialog.getDlgNameAccess(),
 imgBackground);
-oImgControl = 
CurUnoDialog.insertControlModel(com.sun.star.awt.UnoControlImageControlModel, 
imgBackground + sIncSuffix,
-new String[]
-{
-PropertyNames.PROPERTY_BORDER, 
PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_POSITION_X, 
PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, 
PropertyNames.PROPERTY_WIDTH
-},
-new Object[]
-{
-new Short(1), new Integer(iCompHeight), ICompPosX, new 
Integer(iCompPosY), IStep, ICompWidth
-});
-oImgControl = CurUnoDialog.xDlgContainer.getControl(imgBackground + 
sIncSuffix);
-setComponentMouseTransparent();
 xScrollBar = CurUnoDialog.insertScrollBar(TitleScrollBar + 
sIncSuffix, 0,
 new AdjustmentListenerImpl(),
 new String[]
@@ -143,17 +131,6 @@ public abstract class ControlScroller
 }
 }
 
-public void setComponentMouseTransparent()
-{
-CurUnoDialog.getPeerConfiguration().setPeerProperties(oImgControl, new 
String[]
-{
-MouseTransparent
-}, new Boolean[]
-{
-Boolean.TRUE
-});
-}
-
 protected void setScrollBarOrientationHorizontal()
 {
 Helper.setUnoPropertyValue(xScrollBar, PropertyNames.ORIENTATION, new 
Integer(ScrollBarOrientation.HORIZONTAL));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - svtools/bmpmaker svtools/source sw/source

[Caolán McNamara]

 svtools/bmpmaker/bmpsum.cxx |   33 +
 svtools/source/filter/sgvtext.cxx   |   24 +++-
 svtools/source/filter/wmf/wmfwr.cxx |   24 +---
 svtools/source/filter/wmf/wmfwr.hxx |4 ++--
 svtools/source/inc/sgvmain.hxx  |2 +-
 svtools/source/misc/transfer.cxx|   12 ++--
 sw/source/filter/ww8/wrtww8.cxx |2 +-
 sw/source/filter/ww8/ww8scan.cxx|6 +++---
 8 files changed, 50 insertions(+), 57 deletions(-)

New commits:
commit 7b30516245c4c067e2fca8136cb3919538760169
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jan 31 16:52:56 2012 +

SWAPLONG-OSL_BIGENDIAN

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 083854f..edee204 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -1055,7 +1055,7 @@ bool WW8_WrFkp::Combine()
 // werden
 sal_uInt32* p;
 for( i = 0, p = (sal_uInt32*)pFkp; i = nIMax; i++, p++ )
-*p = SWAPLONG( *p );
+*p = OSL_SWAPDWORD( *p );
 #endif // ifdef OSL_BIGENDIAN
 
 return true;
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 593624b..aab03f5 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -1996,7 +1996,7 @@ WW8PLCFspecial::WW8PLCFspecial(SvStream* pSt, sal_uInt32 
nFilePos,
 nIMax = ( nPLCF - 4 ) / ( 4 + nStruct );
 #ifdef OSL_BIGENDIAN
 for( nIdx = 0; nIdx = nIMax; nIdx++ )
-pPLCF_PosArray[nIdx] = SWAPLONG( pPLCF_PosArray[nIdx] );
+pPLCF_PosArray[nIdx] = OSL_SWAPDWORD( pPLCF_PosArray[nIdx] );
 nIdx = 0;
 #endif // OSL_BIGENDIAN
 if( nStruct ) // Pointer auf Inhalts-Array
@@ -2150,7 +2150,7 @@ void WW8PLCF::ReadPLCF(SvStream rSt, WW8_FC nFilePos, 
sal_uInt32 nPLCF)
 {
 #ifdef OSL_BIGENDIAN
 for( nIdx = 0; nIdx = nIMax; nIdx++ )
-pPLCF_PosArray[nIdx] = SWAPLONG( pPLCF_PosArray[nIdx] );
+pPLCF_PosArray[nIdx] = OSL_SWAPDWORD( pPLCF_PosArray[nIdx] );
 nIdx = 0;
 #endif // OSL_BIGENDIAN
 // Pointer auf Inhalts-Array
@@ -2332,7 +2332,7 @@ WW8PLCFpcd::WW8PLCFpcd(SvStream* pSt, sal_uInt32 nFilePos,
 nIMax = ( nPLCF - 4 ) / ( 4 + nStruct );
 #ifdef OSL_BIGENDIAN
 for( long nI = 0; nI = nIMax; nI++ )
-  pPLCF_PosArray[nI] = SWAPLONG( pPLCF_PosArray[nI] );
+  pPLCF_PosArray[nI] = OSL_SWAPDWORD( pPLCF_PosArray[nI] );
 #endif // OSL_BIGENDIAN
 
 // Pointer auf Inhalts-Array
commit edeb3af5d42475292fe890f1872bf3c456530033
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jan 31 15:29:36 2012 +

adapt bmpmaker

diff --git a/svtools/bmpmaker/bmpsum.cxx b/svtools/bmpmaker/bmpsum.cxx
index 223f76d..c572737 100644
--- a/svtools/bmpmaker/bmpsum.cxx
+++ b/svtools/bmpmaker/bmpsum.cxx
@@ -298,7 +298,7 @@ void BmpSum::ProcessFileList( const String rInFileList,
 if( aIStm.IsOpen()  aOStm.IsOpen() )
 {
 rtl::OString aReadLine;
-::std::set ByteString aFileNameSet;
+::std::setrtl::OString aFileNameSet;
 
 while( aIStm.ReadLine( aReadLine ) )
 {
@@ -345,13 +345,13 @@ void BmpSum::ProcessFileList( const String rInFileList,
 
 aIStm.Close();
 
-::std::set ByteString ::iterator aIter( aFileNameSet.begin() );
-::std::map sal_uInt64, ::std::vector ByteString   aFileNameMap;
+::std::set rtl::OString ::iterator aIter( aFileNameSet.begin() );
+::std::map sal_uInt64, ::std::vector rtl::OString   aFileNameMap;
 
 while( aIter != aFileNameSet.end() )
 {
-ByteString  aStr( *aIter++ );
-SvFileStreamaBmpStm( String( aStr.GetBuffer(), 
RTL_TEXTENCODING_ASCII_US ), STREAM_READ );
+rtl::OString aStr( *aIter++ );
+SvFileStreamaBmpStm(rtl::OStringToOUString(aStr, 
RTL_TEXTENCODING_ASCII_US), STREAM_READ);
 sal_uInt64  nCRC = 0;
 
 if( aBmpStm.IsOpen() )
@@ -375,7 +375,7 @@ void BmpSum::ProcessFileList( const String rInFileList,
nCRC = GetCRC( aBmpEx );
 
 else
-fprintf( stderr, %s could not be opened\n, 
aStr.GetBuffer() );
+fprintf( stderr, %s could not be opened\n, 
aStr.getStr() );
}
 
 aBmpStm.Close();
@@ -383,36 +383,36 @@ void BmpSum::ProcessFileList( const String rInFileList,
 
 if( nCRC )
 {
-::std::map sal_uInt64, ::std::vector ByteString  
::iterator aFound( aFileNameMap.find( nCRC ) );
+::std::map sal_uInt64, ::std::vector rtl::OString  
::iterator aFound( aFileNameMap.find( nCRC ) );
 
 if( aFound != aFileNameMap.end() )
 (*aFound).second.push_back( aStr );
 else
 {
-::std::vector ByteString  aVector( 1, aStr );
+ 

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

[Eike Rathke]

 svtools/source/filter/sgvtext.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 109a84546ab33d17e29a6e6a04ea7e460219a357
Author: Julien Nabet serval2...@yahoo.fr
Date:   Mon Jan 30 21:21:34 2012 +0100

Replace literal control characters (thank you Eike !)
(cherry picked from commit 10bfc4df5335c6cd2ae700df7485668d896998b5)

Signed-off-by: Eike Rathke er...@redhat.com

diff --git a/svtools/source/filter/sgvtext.cxx 
b/svtools/source/filter/sgvtext.cxx
index 171d141..fbf9864 100644
--- a/svtools/source/filter/sgvtext.cxx
+++ b/svtools/source/filter/sgvtext.cxx
@@ -136,10 +136,10 @@ extern SgfFontLst* pSgfFonts;
 //EscBold, 
EscLSlnt,EscRSlnt,EscUndln,EscDbUnd,EscKaptF,EscStrik,EscDbStk,
 //EscSupSc,EscSubSc,Esc2DShd,Esc3DShd,Esc4DShd];
 // Justify muss spaetestens am Anfang des Absatzes stehen
-#define  EscSet'' /* Flag setzen  
 */
-#define  EscReset  '' /* Flag loeschen
 */
+#define  EscSet'\x1e' /* Flag setzen   
*/
+#define  EscReset  '\x1f' /* Flag loeschen 
*/
 #define  EscDeflt  '\x11' /* Flag auf default setzen   
 */
-#define  EscToggl  '' /* Flag Toggeln 
 */
+#define  EscToggl  '\x1d' /* Flag Toggeln  
*/
 #define  EscRelat  '%'
 #define  EscNoFlg  0
 #define  EscNoVal  -2147483647 /* -MaxLongInt */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5-0' - wizards/com

[Michael Stahl]

 wizards/com/sun/star/wizards/ui/ControlScroller.java |   23 ---
 1 file changed, 23 deletions(-)

New commits:
commit b6c00fb358cbfcd74d71e99a8fe3b277a1f87a32
Author: Jan Holesovsky ke...@suse.cz
Date:   Tue Jan 31 17:10:26 2012 +0100

Fix fdo#42543: Don't paint a frame around the list of edit boxes.

This conflicts with commit efc6b840a0423099d6c3e0d33c14d34637fbba4c that
reorders painting of windows when they overlap; and in this case, the frame
image paints over the controls.

The sideeffect is that the dialog looks nicer ;-)
(cherry picked from commit d26f06b33b6958cb15b16dbfe3e12ab0126c23a7)

Signed-off-by: Lubos Lunak l.lu...@suse.cz
Signed-off-by: Michael Stahl mst...@redhat.com
Signed-off-by: Noel Power nopo...@suse.com

diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java 
b/wizards/com/sun/star/wizards/ui/ControlScroller.java
index c9aeee6..a04d1c1 100644
--- a/wizards/com/sun/star/wizards/ui/ControlScroller.java
+++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java
@@ -39,7 +39,6 @@ public abstract class ControlScroller
 
 protected WizardDialog CurUnoDialog;
 protected XMultiServiceFactory xMSF;
-private Object oImgControl;
 protected int ncurfieldcount;
 protected int nblockincrement;
 private int nlineincrement;
@@ -113,17 +112,6 @@ public abstract class ControlScroller
 int ScrollHeight = iCompHeight - 2;
 nlineincrement = 1;
 sIncSuffix = 
com.sun.star.wizards.common.Desktop.getIncrementSuffix(CurUnoDialog.getDlgNameAccess(),
 imgBackground);
-oImgControl = 
CurUnoDialog.insertControlModel(com.sun.star.awt.UnoControlImageControlModel, 
imgBackground + sIncSuffix,
-new String[]
-{
-PropertyNames.PROPERTY_BORDER, 
PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_POSITION_X, 
PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, 
PropertyNames.PROPERTY_WIDTH
-},
-new Object[]
-{
-new Short(1), new Integer(iCompHeight), ICompPosX, new 
Integer(iCompPosY), IStep, ICompWidth
-});
-oImgControl = CurUnoDialog.xDlgContainer.getControl(imgBackground + 
sIncSuffix);
-setComponentMouseTransparent();
 xScrollBar = CurUnoDialog.insertScrollBar(TitleScrollBar + 
sIncSuffix, 0,
 new AdjustmentListenerImpl(),
 new String[]
@@ -143,17 +131,6 @@ public abstract class ControlScroller
 }
 }
 
-public void setComponentMouseTransparent()
-{
-CurUnoDialog.getPeerConfiguration().setPeerProperties(oImgControl, new 
String[]
-{
-MouseTransparent
-}, new Boolean[]
-{
-Boolean.TRUE
-});
-}
-
 protected void setScrollBarOrientationHorizontal()
 {
 Helper.setUnoPropertyValue(xScrollBar, PropertyNames.ORIENTATION, new 
Integer(ScrollBarOrientation.HORIZONTAL));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Petr Mladek]

 sw/source/core/layout/paintfrm.cxx |   16 
 1 file changed, 16 insertions(+)

New commits:
commit 52416a69ccb2bc9f6d5de89ff92086ec78d3dd66
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date:   Tue Jan 31 15:39:54 2012 +0100

fdo#44836: Hide all the page breaks of the pages before the first visible 
one

Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 074a54a..dced1b7 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2850,6 +2850,22 @@ SwRootFrm::Paint(SwRect const rRect, SwPrintData 
const*const pPrintData) const
 // #i68597#
 const bool bGridPainting(pSh-GetWin()  pSh-Imp()-HasDrawView()  
pSh-Imp()-GetDrawView()-IsGridVisible());
 
+// Hide all page break controls before showing them again
+SwWrtShell* pWrtSh = dynamic_cast SwWrtShell* ( pGlobalShell );
+if ( pWrtSh )
+{
+SwEditWin rEditWin = pWrtSh-GetView().GetEditWin();
+SwFrameControlsManager rMngr = rEditWin.GetFrameControlsManager();
+const SwPageFrm* pHiddenPage = pPage;
+while ( pHiddenPage-GetPrev() != NULL )
+{
+pHiddenPage = static_cast const SwPageFrm* ( 
pHiddenPage-GetPrev() );
+SwFrameControlPtr pControl = rMngr.GetControl( PageBreak, 
pHiddenPage );
+if ( pControl.get() )
+pControl-ShowAll( false );
+}
+}
+
 // #i76669#
 SwViewObjectContactRedirector aSwRedirector( *pSh );
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Petr Mladek]

 sw/source/core/layout/paintfrm.cxx |   16 
 1 file changed, 16 insertions(+)

New commits:
commit 1b8de4e286b8ba385b7ef361a508b2f3bb25e878
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date:   Tue Jan 31 15:39:54 2012 +0100

fdo#44836: Hide all the page breaks of the pages before the first visible 
one

Signed-off-by: Petr Mladek pmla...@suse.cz
Signed-off-by: Michael Meeks michael.me...@suse.com
Signed-off-by: Michael Stahl mst...@redhat.com

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 074a54a..dced1b7 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2850,6 +2850,22 @@ SwRootFrm::Paint(SwRect const rRect, SwPrintData 
const*const pPrintData) const
 // #i68597#
 const bool bGridPainting(pSh-GetWin()  pSh-Imp()-HasDrawView()  
pSh-Imp()-GetDrawView()-IsGridVisible());
 
+// Hide all page break controls before showing them again
+SwWrtShell* pWrtSh = dynamic_cast SwWrtShell* ( pGlobalShell );
+if ( pWrtSh )
+{
+SwEditWin rEditWin = pWrtSh-GetView().GetEditWin();
+SwFrameControlsManager rMngr = rEditWin.GetFrameControlsManager();
+const SwPageFrm* pHiddenPage = pPage;
+while ( pHiddenPage-GetPrev() != NULL )
+{
+pHiddenPage = static_cast const SwPageFrm* ( 
pHiddenPage-GetPrev() );
+SwFrameControlPtr pControl = rMngr.GetControl( PageBreak, 
pHiddenPage );
+if ( pControl.get() )
+pControl-ShowAll( false );
+}
+}
+
 // #i76669#
 SwViewObjectContactRedirector aSwRedirector( *pSh );
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/android' - 5 commits - android/qa desktop/source vcl/android

[Michael Meeks]

 android/qa/desktop/Makefile   |   14 ++
 android/qa/desktop/fonts.conf |   21 +
 desktop/source/app/app.cxx|6 +++---
 vcl/android/androidinst.cxx   |   14 +++---
 4 files changed, 49 insertions(+), 6 deletions(-)

New commits:
commit c2aab432b172e0d1974139e62f64e36aa3dbfb85
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Jan 31 17:39:05 2012 +

android: get BGR to RGB swap right in conversion

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 02219c8..b20d7c4 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -231,9 +231,9 @@ static void BlitFrameRegionToWindow(ANativeWindow_Buffer 
*pOutBuffer,
   nDestX * 4 /* dest pixel size */ );
 for (unsigned int x = 0; x  (unsigned int)(aSrcRect.right - 
aSrcRect.left); x++)
 {
-dp[x*4 + 0] = sp[x*3 + 0]; // B
+dp[x*4 + 0] = sp[x*3 + 2]; // R
 dp[x*4 + 1] = sp[x*3 + 1]; // G
-dp[x*4 + 2] = sp[x*3 + 2]; // R
+dp[x*4 + 2] = sp[x*3 + 0]; // B
 dp[x*4 + 3] = 255; // A
 }
 break;
commit 9634eec8e123c0860f2716039570dd91a9839943
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Jan 31 17:33:40 2012 +

android: debug / dump multi-touch events

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 081f11b..02219c8 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -443,11 +443,19 @@ int32_t AndroidSalInstance::onInputEvent (struct 
android_app* app, AInputEvent*
 }
 case AINPUT_EVENT_TYPE_MOTION:
 {
-fprintf (stderr, motion event %d %g %g %s\n,
+size_t nPoints = AMotionEvent_getPointerCount(event);
+fprintf (stderr, motion event %d %g,%g %d points: %s\n,
  AMotionEvent_getAction(event),
  AMotionEvent_getXOffset(event),
  AMotionEvent_getYOffset(event),
+ (int)nPoints,
  
MotionEdgeFlagsToString(AMotionEvent_getEdgeFlags(event)).getStr());
+for (size_t i = 0; i  nPoints; i++)
+fprintf(stderr, \t%d: %g,%g - pressure %g\n,
+(int)i,
+AMotionEvent_getX(event, i),
+AMotionEvent_getY(event, i),
+AMotionEvent_getPressure(event, i));
 break;
 }
 default:
commit 755227bf6dd5d8061869e68f5c970780a5e3b53b
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Jan 31 17:32:09 2012 +

android: get non-modal message dialog up, and continue to main app execute

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 6101827..966bebb 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1863,9 +1863,9 @@ int Desktop::Main()
 ::plasma_now(pre hit execute!);
 
 // For some reason we're not getting a desktop frame or 
component [odd]
-ErrorBox aKickStartVCL( NULL, WB_OK, 
rtl::OUString::createFromAscii(Title!) );
-aKickStartVCL.SetText( rtl::OUString::createFromAscii(Foo) );
-aKickStartVCL.Execute();
+ErrorBox aKickStartVCL( NULL, WB_OK, 
rtl::OUString::createFromAscii(My very own title!) );
+aKickStartVCL.SetText( rtl::OUString::createFromAscii(Delphic 
Utterance) );
+aKickStartVCL.Show(); // don't execute - just leave it lying 
around 
 
 ::plasma_now(hit execute!);
 
commit 96445c9520a252fdb41c934cc77764c200c086af
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Jan 31 17:30:27 2012 +

android: try to get skeletal fonts into fontconfig setup

diff --git a/android/qa/desktop/fonts.conf b/android/qa/desktop/fonts.conf
index 0e92c5d..64d714c 100644
--- a/android/qa/desktop/fonts.conf
+++ b/android/qa/desktop/fonts.conf
@@ -7,6 +7,27 @@
 
dir/system/fonts/dir
 
+   alias
+   familyserif/family
+   prefer
+   familyDroidSerif/family
+   familyRoboto/family
+   /prefer
+   /alias
+   alias
+   familysans-serif/family
+   prefer
+   familyRoboto/family
+   familyDroidSerif/family
+   /prefer
+   /alias
+   alias
+   familymonospace/family
+   prefer
+   familyDroidSansMono/family
+   /prefer
+   /alias
+
 !--
   Accept deprecated 'mono' alias, replacing it with 'monospace'
 --
commit 498fc0b198f81e4f2aa2e69f60b7877f6db3dd0c
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Jan 31 17:22:20 2012 +

android: package more components needed for writer

diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 876c432..3475248 100644
--- 

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

[Ivan Timofeev]

 sd/inc/cusshow.hxx|1 +
 sd/source/core/cusshow.cxx|7 ++-
 sd/source/core/drawdoc_animations.cxx |6 +-
 sd/source/ui/unoidl/unocpres.cxx  |   10 --
 4 files changed, 16 insertions(+), 8 deletions(-)

New commits:
commit f2e17f8f6b6724d7e56d6583d79434372f6221bd
Author: Ivan Timofeev timofeev@gmail.com
Date:   Tue Jan 31 21:38:43 2012 +0400

erase garbage after std::remove

this fixes commit 5a71069339b3a3c118f3015d978799ef66db7564

diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx
index 1bd3614..74c6cfa 100644
--- a/sd/inc/cusshow.hxx
+++ b/sd/inc/cusshow.hxx
@@ -71,6 +71,7 @@ public:
 
 PageVec PagesVector();
 void ReplacePage( const SdPage* pOldPage, const SdPage* pNewPage );
+void RemovePage( const SdPage* pPage );
 
 void   SetName(const String rName);
 String GetName() const;
diff --git a/sd/source/core/cusshow.cxx b/sd/source/core/cusshow.cxx
index dcdb343..d3233b7 100644
--- a/sd/source/core/cusshow.cxx
+++ b/sd/source/core/cusshow.cxx
@@ -106,7 +106,7 @@ void SdCustomShow::ReplacePage( const SdPage* pOldPage, 
const SdPage* pNewPage )
 {
 if( !pNewPage )
 {
-::std::remove(maPages.begin(), maPages.end(), pOldPage);
+RemovePage(pOldPage);
 }
 else
 {
@@ -114,6 +114,11 @@ void SdCustomShow::ReplacePage( const SdPage* pOldPage, 
const SdPage* pNewPage )
 }
 }
 
+void SdCustomShow::RemovePage( const SdPage* pPage )
+{
+maPages.erase(::std::remove(maPages.begin(), maPages.end(), pPage), 
maPages.end());
+}
+
 void   SdCustomShow::SetName(const String rName)
 {
 aName = rName;
diff --git a/sd/source/core/drawdoc_animations.cxx 
b/sd/source/core/drawdoc_animations.cxx
index de62ec5..375dd4d 100644
--- a/sd/source/core/drawdoc_animations.cxx
+++ b/sd/source/core/drawdoc_animations.cxx
@@ -43,11 +43,7 @@ void SdDrawDocument::ReplacePageInCustomShows( const SdPage* 
pOldPage, const SdP
 for (sal_uLong i = 0; i  mpCustomShowList-Count(); i++)
 {
 SdCustomShow* pCustomShow = (SdCustomShow*) 
mpCustomShowList-GetObject(i);
-if( pNewPage == 0 )
-::std::remove(pCustomShow-PagesVector().begin(), 
pCustomShow-PagesVector().end(),
-pOldPage);
-else
-pCustomShow-ReplacePage(pOldPage,pNewPage);
+pCustomShow-ReplacePage(pOldPage, pNewPage);
 }
 }
 }
diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx
index e0aa857..e44f61e 100644
--- a/sd/source/ui/unoidl/unocpres.cxx
+++ b/sd/source/ui/unoidl/unocpres.cxx
@@ -144,10 +144,16 @@ void SAL_CALL SdXCustomPresentation::removeByIndex( 
sal_Int32 Index )
 
 if( xPage.is() )
 {
-SvxDrawPage* pPage = SvxDrawPage::getImplementation(  xPage );
+SvxDrawPage* pPage = SvxDrawPage::getImplementation( xPage );
 if(pPage)
-::std::remove(mpSdCustomShow-PagesVector().begin(), 
mpSdCustomShow-PagesVector().end(),
+{
+SdCustomShow::PageVec::iterator it = std::find(
+mpSdCustomShow-PagesVector().begin(),
+mpSdCustomShow-PagesVector().end(),
 pPage-GetSdrPage());
+if (it != mpSdCustomShow-PagesVector().end())
+mpSdCustomShow-PagesVector().erase(it);
+}
 }
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/osl

[François Tigeot]

 sal/osl/unx/system.h |   23 +--
 1 file changed, 1 insertion(+), 22 deletions(-)

New commits:
commit c7aa517c79f12b6bfe97f2b0a3e27bc6532a172a
Author: François Tigeot ftig...@wolfpond.org
Date:   Tue Jan 31 20:28:54 2012 +0100

Regroup DragonFly and NetBSD configurations

diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index 881bc88..8df8620 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -120,28 +120,7 @@
 #endif
 
 #ifdef NETBSD
-#   include sys/param.h
-#   ifndef ETIME
-# define  ETIME ETIMEDOUT
-#   endif
-#   include pthread.h
-#   include netdb.h
-#   include sys/sem.h
-#   include sys/exec.h
-#   include sys/filio.h
-#   include sys/ioctl.h
-#   include sys/time.h
-#   include sys/un.h
-#   include netinet/tcp.h
-#   include dlfcn.h
-#   include machine/endian.h
-#   define  IORESOURCE_TRANSFER_BSD
-#   define  IOCHANNEL_TRANSFER_BSD_RENO
-#   define  pthread_testcancel()
-#   define  NO_PTHREAD_PRIORITY
-# define  NO_PTHREAD_SEMAPHORES
 #   define  NO_PTHREAD_RTL
-#   define  PTHREAD_SIGACTION   pthread_sigaction
 #endif
 
 #ifdef FREEBSD
@@ -199,7 +178,7 @@
 #   define  PTHREAD_SIGACTION   pthread_sigaction
 #endif
 
-#ifdef DRAGONFLY
+#if defined(DRAGONFLY) || defined(NETBSD)
 #   define  ETIME ETIMEDOUT
 #   include pthread.h
 #   include sys/sem.h
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/inc/cell.hxx|2 --
 sc/inc/formularesult.hxx   |   35 ---
 sc/source/core/data/cell.cxx   |5 -
 sc/source/core/data/table4.cxx |1 -
 4 files changed, 20 insertions(+), 23 deletions(-)

New commits:
commit 742b36ed8bd3880d4dcf6022fbc3165a213d80bb
Author: Eike Rathke er...@redhat.com
Date:   Tue Jan 31 20:40:47 2012 +0100

clone token in ScFormulaResult copy-ctor instead of referring

Replaces commit e2b11f4fd79dce4116badb0ecf6477546ca5d0d4

Prevent excessive references to single token instance during fill.

Because if not, we may run out of the 16-bit integer space to
store reference count.

diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index c1cb906..8a35b43 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -41,6 +41,20 @@ class ScFormulaResult
 static const Multiline MULTILINE_FALSE   = 1;
 static const Multiline MULTILINE_TRUE= 2;
 
+// Clone token if the 16-bit only reference counter is nearing it's
+// capacity during fill or copypaste, leaving 4k for temporary passing
+// around. (That should be enough for all times (TM) ;-)
+static const sal_uInt16 MAX_TOKENREF_COUNT = 0xf000;
+static void IncrementTokenRef( const formula::FormulaToken*  rp )
+{
+if (rp)
+{
+if (rp-GetRef() = MAX_TOKENREF_COUNT)
+rp = rp-Clone();
+rp-IncRef();
+}
+}
+
 union
 {
 double  mfValue;// double result direct for performance 
and memory consumption
@@ -94,8 +108,12 @@ public:
 const ScMatrixFormulaCellToken* 
pMatFormula =
 r.GetMatrixFormulaCellToken();
 if (pMatFormula)
+{
 mpToken = new 
ScMatrixFormulaCellToken( *pMatFormula);
-mpToken-IncRef();
+mpToken-IncRef();
+}
+else
+IncrementTokenRef( mpToken);
 }
 }
 else
@@ -308,8 +326,7 @@ inline void ScFormulaResult::Assign( const ScFormulaResult 
 r )
 inline void ScFormulaResult::SetToken( const formula::FormulaToken* p )
 {
 ResetToDefaults();
-if (p)
-p-IncRef();
+IncrementTokenRef( p);
 // Handle a result obtained from the interpreter to be assigned to a matrix
 // formula cell's ScMatrixFormulaCellToken.
 ScMatrixFormulaCellToken* pMatFormula = 
GetMatrixFormulaCellTokenNonConst();
commit 78997434dd813e7a8d949e510a9de8bbf77b8025
Author: Eike Rathke er...@redhat.com
Date:   Tue Jan 31 20:40:10 2012 +0100

Revert Prevent excessive references to single token instance during fill.

This reverts commit e2b11f4fd79dce4116badb0ecf6477546ca5d0d4.

To be replaced with a different solution.

diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 3bc7aee..52244f6 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -535,8 +535,6 @@ public:
 boolIsMultilineResult();
 
 voidMaybeInterpret();
-
-voidResetFormulaResult();
 };
 
 //  Iterator for references in a formula cell
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index 94c62f8..c1cb906 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -117,8 +117,6 @@ public:
 mpToken-DecRef();
 }
 
-inline void Reset();
-
 /** Well, guess what ... */
 inline  ScFormulaResultoperator=( const ScFormulaResult  r );
 
@@ -218,16 +216,6 @@ public:
 inline ScMatrixFormulaCellToken* GetMatrixFormulaCellTokenNonConst();
 };
 
-inline void ScFormulaResult::Reset()
-{
-ResetToDefaults();
-
-if (mbToken  mpToken)
-mpToken-DecRef();
-
-mbToken = true;
-mpToken = NULL;
-}
 
 inline void ScFormulaResult::ResetToDefaults()
 {
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 1f89aed..2f3df26 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -2041,11 +2041,6 @@ void ScFormulaCell::MaybeInterpret()
 Interpret();
 }
 
-void ScFormulaCell::ResetFormulaResult()
-{
-aResult.Reset();
-}
-
 EditTextObject* ScFormulaCell::CreateURLObject()
 {
 String aCellText;
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 6a21a07..dac4111 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -429,7 +429,6 @@ void ScTable::FillFormula(sal_uLong /* 

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

[Michael Meeks]

 vcl/android/androidinst.cxx   |   10 +-
 vcl/inc/headless/svpframe.hxx |2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 436e2f870144342aa6bcc28a3a5cea32680eaacf
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Jan 31 19:53:49 2012 +

android: undo broken AnyInput method causing app startup to fail.

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index b20d7c4..dfb8855 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -572,11 +572,11 @@ void AndroidSalInstance::DoReleaseYield (int nTimeoutMS)
 
 bool AndroidSalInstance::AnyInput( sal_uInt16 nType )
 {
-(void) nType;
-// FIXME: ideally we should check the input queue to avoid being busy ...
-fprintf (stderr, FIXME: AnyInput returns true\n);
-// mpApp-inputQueue ? ...
-return true;
+if( (nType  VCL_INPUT_TIMER) != 0 )
+return CheckTimeout( false );
+// FIXME: ideally we should check our input queue here ...
+fprintf (stderr, FIXME: AnyInput returns false\n);
+return false;
 }
 
 class AndroidSalSystem : public SvpSalSystem {
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 8de4054..fc923af 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -74,7 +74,7 @@ public:
 virtual SalGraphics*GetGraphics();
 virtual voidReleaseGraphics( SalGraphics* pGraphics );
 
-virtual sal_BoolPostEvent( void* pData );
+virtual sal_BoolPostEvent( void* pData );
 
 virtual voidSetTitle( const rtl::OUString rTitle );
 virtual voidSetIcon( sal_uInt16 nIcon );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/inc/formularesult.hxx |   23 ---
 1 file changed, 20 insertions(+), 3 deletions(-)

New commits:
commit ab2c9edeb47804840b5c50dd8198556e3ea9d29e
Author: Eike Rathke er...@redhat.com
Date:   Tue Jan 31 20:40:47 2012 +0100

clone token in ScFormulaResult copy-ctor instead of referring

Replaces commit e2b11f4fd79dce4116badb0ecf6477546ca5d0d4

Prevent excessive references to single token instance during fill.

Because if not, we may run out of the 16-bit integer space to
store reference count.

Signed-off-by: Kohei Yoshida kohei.yosh...@suse.com

diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index 2aa674c..444552f 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -41,6 +41,20 @@ class ScFormulaResult
 static const Multiline MULTILINE_FALSE   = 1;
 static const Multiline MULTILINE_TRUE= 2;
 
+// Clone token if the 16-bit only reference counter is nearing it's
+// capacity during fill or copypaste, leaving 4k for temporary passing
+// around. (That should be enough for all times (TM) ;-)
+static const sal_uInt16 MAX_TOKENREF_COUNT = 0xf000;
+static void IncrementTokenRef( const formula::FormulaToken*  rp )
+{
+if (rp)
+{
+if (rp-GetRef() = MAX_TOKENREF_COUNT)
+rp = rp-Clone();
+rp-IncRef();
+}
+}
+
 union
 {
 double  mfValue;// double result direct for performance 
and memory consumption
@@ -94,8 +108,12 @@ public:
 const ScMatrixFormulaCellToken* 
pMatFormula =
 r.GetMatrixFormulaCellToken();
 if (pMatFormula)
+{
 mpToken = new 
ScMatrixFormulaCellToken( *pMatFormula);
-mpToken-IncRef();
+mpToken-IncRef();
+}
+else
+IncrementTokenRef( mpToken);
 }
 }
 else
@@ -308,8 +326,7 @@ inline void ScFormulaResult::Assign( const ScFormulaResult 
 r )
 inline void ScFormulaResult::SetToken( const formula::FormulaToken* p )
 {
 ResetToDefaults();
-if (p)
-p-IncRef();
+IncrementTokenRef( p);
 // Handle a result obtained from the interpreter to be assigned to a matrix
 // formula cell's ScMatrixFormulaCellToken.
 ScMatrixFormulaCellToken* pMatFormula = 
GetMatrixFormulaCellTokenNonConst();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sc/inc

[Kohei Yoshida]

 sc/inc/formularesult.hxx |   23 ---
 1 file changed, 20 insertions(+), 3 deletions(-)

New commits:
commit 23ca5386808ace4ed73aeabadea44e96d696742b
Author: Eike Rathke er...@redhat.com
Date:   Tue Jan 31 20:40:47 2012 +0100

clone token in ScFormulaResult copy-ctor instead of referring

Replaces commit e2b11f4fd79dce4116badb0ecf6477546ca5d0d4

Prevent excessive references to single token instance during fill.

Because if not, we may run out of the 16-bit integer space to
store reference count.

Signed-off-by: Kohei Yoshida kohei.yosh...@suse.com

diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index bd68e52..454753b 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -41,6 +41,20 @@ class ScFormulaResult
 static const Multiline MULTILINE_FALSE   = 1;
 static const Multiline MULTILINE_TRUE= 2;
 
+// Clone token if the 16-bit only reference counter is nearing it's
+// capacity during fill or copypaste, leaving 4k for temporary passing
+// around. (That should be enough for all times (TM) ;-)
+static const sal_uInt16 MAX_TOKENREF_COUNT = 0xf000;
+static void IncrementTokenRef( const formula::FormulaToken*  rp )
+{
+if (rp)
+{
+if (rp-GetRef() = MAX_TOKENREF_COUNT)
+rp = rp-Clone();
+rp-IncRef();
+}
+}
+
 union
 {
 double  mfValue;// double result direct for performance 
and memory consumption
@@ -94,8 +108,12 @@ public:
 const ScMatrixFormulaCellToken* 
pMatFormula =
 r.GetMatrixFormulaCellToken();
 if (pMatFormula)
+{
 mpToken = new 
ScMatrixFormulaCellToken( *pMatFormula);
-mpToken-IncRef();
+mpToken-IncRef();
+}
+else
+IncrementTokenRef( mpToken);
 }
 }
 else
@@ -308,8 +326,7 @@ inline void ScFormulaResult::Assign( const ScFormulaResult 
 r )
 inline void ScFormulaResult::SetToken( const formula::FormulaToken* p )
 {
 ResetToDefaults();
-if (p)
-p-IncRef();
+IncrementTokenRef( p);
 // Handle a result obtained from the interpreter to be assigned to a matrix
 // formula cell's ScMatrixFormulaCellToken.
 ScMatrixFormulaCellToken* pMatFormula = 
GetMatrixFormulaCellTokenNonConst();
___
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 - oox/Library_oox.mk sw/inc

[René Engelhard]

 oox/Library_oox.mk |4 
 sw/inc/cellatr.hxx |1 +
 2 files changed, 5 insertions(+)

New commits:
commit 0558807ddc938d945eda23da00d446df4ac5573a
Author: Rene Engelhard r...@debian.org
Date:   Tue Jan 31 21:09:48 2012 +0100

build oox with explicit -Os on ia64 as it otherwise gets too big to link

diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index f513f9b..a8244ac 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -40,6 +40,10 @@ $(eval $(call gb_Library_set_include,oox,\
 -I$(realpath $(SRCDIR)/oox/inc) \
 ))
 
+$(eval $(call gb_Library_add_cxxflags,oox,\
+-Os \
+))
+
 $(eval $(call gb_Library_add_defs,oox,\
 -DOOX_DLLIMPLEMENTATION \
 ))
commit 6597d4bec2a26c8cf7232e02aef5632f3b8df7c5
Author: Rene Engelhard r...@debian.org
Date:   Tue Jan 31 21:06:47 2012 +0100

add explicit empty SwTblBoxFormula destructor to fix armel build...

diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index e081375..c147379 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -64,6 +64,7 @@ class SwTblBoxFormula : public SfxPoolItem, public 
SwTableFormula
 
 public:
 SwTblBoxFormula( const String rFormula );
+~SwTblBoxFormula() {};
 
 // pure virtual methods of SfxPoolItem
 virtual int operator==( const SfxPoolItem ) const;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - oox/Library_oox.mk sw/inc

[René Engelhard]

 oox/Library_oox.mk |4 
 sw/inc/cellatr.hxx |1 +
 2 files changed, 5 insertions(+)

New commits:
commit bd530e28868f8573fdb85d45c80f07a66edb8d7b
Author: Rene Engelhard r...@debian.org
Date:   Tue Jan 31 21:09:48 2012 +0100

build oox with explicit -Os on ia64 as it otherwise gets too big to link

diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index f513f9b..a8244ac 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -40,6 +40,10 @@ $(eval $(call gb_Library_set_include,oox,\
 -I$(realpath $(SRCDIR)/oox/inc) \
 ))
 
+$(eval $(call gb_Library_add_cxxflags,oox,\
+-Os \
+))
+
 $(eval $(call gb_Library_add_defs,oox,\
 -DOOX_DLLIMPLEMENTATION \
 ))
commit be4dc9f80c62435a42c6ed0967eee443abd6e3dd
Author: Rene Engelhard r...@debian.org
Date:   Tue Jan 31 21:06:47 2012 +0100

add explicit empty SwTblBoxFormula destructor to fix armel build...

diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index e081375..c147379 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -64,6 +64,7 @@ class SwTblBoxFormula : public SfxPoolItem, public 
SwTableFormula
 
 public:
 SwTblBoxFormula( const String rFormula );
+~SwTblBoxFormula() {};
 
 // pure virtual methods of SfxPoolItem
 virtual int operator==( const SfxPoolItem ) const;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - editeng/source svtools/source

[Caolán McNamara]

 editeng/source/rtf/rtfgrf.cxx|2 +-
 svtools/source/filter/wmf/winwmf.cxx |2 +-
 svtools/source/filter/wmf/wmfwr.cxx  |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6b6bbe539bf4c72773b280addc7150656f83713b
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jan 31 20:23:25 2012 +

SWAPLONG-OSL_SWAPDWORD

diff --git a/editeng/source/rtf/rtfgrf.cxx b/editeng/source/rtf/rtfgrf.cxx
index f22a0a4..142b48d 100644
--- a/editeng/source/rtf/rtfgrf.cxx
+++ b/editeng/source/rtf/rtfgrf.cxx
@@ -164,7 +164,7 @@ static sal_uInt8 aPal8[ 256 * 4 ] =
 inline long SwapLong( long n )
 {
 #ifndef OSL_LITENDIAN
-return SWAPLONG( n );
+return OSL_SWAPDWORD( n );
 #else
 return n;
 #endif
commit 19f53f40039a935fee48fdf1fb1f801f489fd478
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jan 31 20:21:22 2012 +

SWAPLONG-OSL_SWAPDWORD

diff --git a/svtools/source/filter/wmf/winwmf.cxx 
b/svtools/source/filter/wmf/winwmf.cxx
index c6e76d7..214dd57 100644
--- a/svtools/source/filter/wmf/winwmf.cxx
+++ b/svtools/source/filter/wmf/winwmf.cxx
@@ -875,7 +875,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
 if ( nEscLen = ( nRecSize * 2 ) )
 {
 #ifdef OSL_BIGENDIAN
-sal_uInt32 nTmp = SWAPLONG( nEsc );
+sal_uInt32 nTmp = OSL_SWAPDWORD( nEsc );
 sal_uInt32 nCheckSum = rtl_crc32( 0, nTmp, 4 
);
 #else
 sal_uInt32 nCheckSum = rtl_crc32( 0, nEsc, 4 
);
diff --git a/svtools/source/filter/wmf/wmfwr.cxx 
b/svtools/source/filter/wmf/wmfwr.cxx
index 2079154..ca0caad 100644
--- a/svtools/source/filter/wmf/wmfwr.cxx
+++ b/svtools/source/filter/wmf/wmfwr.cxx
@@ -523,7 +523,7 @@ bool IsStarSymbol(const String rStr)
 void WMFWriter::WMFRecord_Escape( sal_uInt32 nEsc, sal_uInt32 nLen, const 
sal_Int8* pData )
 {
 #ifdef OSL_BIGENDIAN
-sal_uInt32 nTmp = SWAPLONG( nEsc );
+sal_uInt32 nTmp = OSL_SWAPDWORD( nEsc );
 sal_uInt32 nCheckSum = rtl_crc32( 0, nTmp, 4 );
 #else
 sal_uInt32 nCheckSum = rtl_crc32( 0, nEsc, 4 );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oox/Library_oox.mk

[René Engelhard]

 oox/Library_oox.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 95c826237d264457b77f3c6f782bc5665897c411
Author: Rene Engelhard r...@debian.org
Date:   Tue Jan 31 21:26:50 2012 +0100

add missed ifeq to check for IA64...

diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index a8244ac..089605d 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -40,9 +40,11 @@ $(eval $(call gb_Library_set_include,oox,\
 -I$(realpath $(SRCDIR)/oox/inc) \
 ))
 
+ifeq ($(CPUNAME),IA64)
 $(eval $(call gb_Library_add_cxxflags,oox,\
 -Os \
 ))
+endif
 
 $(eval $(call gb_Library_add_defs,oox,\
 -DOOX_DLLIMPLEMENTATION \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - oox/Library_oox.mk

[René Engelhard]

 oox/Library_oox.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 168d3b12482e2cf1bbd331ba4e9d2d86f0184273
Author: Rene Engelhard r...@debian.org
Date:   Tue Jan 31 21:26:50 2012 +0100

add missed ifeq to check for IA64...

diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index a8244ac..089605d 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -40,9 +40,11 @@ $(eval $(call gb_Library_set_include,oox,\
 -I$(realpath $(SRCDIR)/oox/inc) \
 ))
 
+ifeq ($(CPUNAME),IA64)
 $(eval $(call gb_Library_add_cxxflags,oox,\
 -Os \
 ))
+endif
 
 $(eval $(call gb_Library_add_defs,oox,\
 -DOOX_DLLIMPLEMENTATION \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Lionel Elie Mamane]

 dbaccess/source/core/api/KeySet.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit f96a392d2ee541cbaac6517b1e4f75a49f9f49f2
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Jan 31 21:32:55 2012 +0100

fdo#45453: use integers rather than booleans

for always-true and always-false tests.
Some databases have poor or no support for booleans.

diff --git a/dbaccess/source/core/api/KeySet.cxx 
b/dbaccess/source/core/api/KeySet.cxx
index a7d9abe..1903110 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -228,8 +228,8 @@ 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_sParam0(RTL_CONSTASCII_USTRINGPARAM( ( 1 = ? 
AND ));
+static ::rtl::OUString s_sParam1(RTL_CONSTASCII_USTRINGPARAM( = ? OR 
1 = ? AND ));
 static ::rtl::OUString s_sParam2(RTL_CONSTASCII_USTRINGPARAM( IS NULL 
) ));
 o_buf.append(s_sParam0);
 o_buf.append(tblName);
@@ -247,16 +247,16 @@ void OKeySet::setOneKeyColumnParameter( sal_Int32 nPos, 
const Reference XParam
 {
 if ( _rValue.isNull() )
 {
-_xParameter-setBoolean( nPos++, false );
+_xParameter-setByte( nPos++, 0 );
 // We do the full call so that the right sqlType is passed to setNull
 setParameter( nPos++, _xParameter, _rValue, _nType, _nScale );
-_xParameter-setBoolean( nPos++, true );
+_xParameter-setByte( nPos++, 1 );
 }
 else
 {
-_xParameter-setBoolean( nPos++, true );
+_xParameter-setByte( nPos++, 1 );
 setParameter( nPos++, _xParameter, _rValue, _nType, _nScale );
-_xParameter-setBoolean( nPos++, false );
+_xParameter-setByte( nPos++, 0 );
 }
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: chart2/source unusedcode.easy

[Caolán McNamara]

 chart2/source/view/axes/Tickmarks_Equidistant.cxx |   27 --
 chart2/source/view/axes/Tickmarks_Equidistant.hxx |5 
 unusedcode.easy   |3 --
 3 files changed, 35 deletions(-)

New commits:
commit 00445037550d07952ea428a4fcd0a3f205f75794
Author: Santiago Martinez smvar...@gmail.com
Date:   Tue Jan 31 19:59:31 2012 +0100

Remove unused code.

diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx 
b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
index 7e15dda..73379b0 100644
--- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx
+++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
@@ -626,33 +626,6 @@ bool EquidistantTickIter::gotoNext()
 return true;
 }
 
-bool EquidistantTickIter::gotoIndex( sal_Int32 nTickIndex )
-{
-if( nTickIndex  0 )
-return false;
-if( nTickIndex = m_nTickCount )
-return false;
-
-if( nTickIndex  m_nCurrentPos )
-if( !gotoFirst() )
-return false;
-
-while( nTickIndex  m_nCurrentPos )
-if( !gotoNext() )
-return false;
-
-return true;
-}
-
-sal_Int32 EquidistantTickIter::getCurrentIndex() const
-{
-return m_nCurrentPos;
-}
-sal_Int32 EquidistantTickIter::getMaxIndex() const
-{
-return m_nTickCount-1;
-}
-
 double* EquidistantTickIter::nextValue()
 {
 if( gotoNext() )
diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.hxx 
b/chart2/source/view/axes/Tickmarks_Equidistant.hxx
index c312b2f..c9f2dc5 100644
--- a/chart2/source/view/axes/Tickmarks_Equidistant.hxx
+++ b/chart2/source/view/axes/Tickmarks_Equidistant.hxx
@@ -60,11 +60,6 @@ public:
 
 sal_Int32   getCurrentDepth() const { return m_nCurrentDepth; }
 
-protected:
-boolgotoIndex( sal_Int32 nTickIndex );
-sal_Int32   getCurrentIndex() const;
-sal_Int32   getMaxIndex() const;
-
 private: //methods
 sal_Int32   getIntervalCount( sal_Int32 nDepth );
 boolisAtLastPartTick();
diff --git a/unusedcode.easy b/unusedcode.easy
index a54e369..32f3dac 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1228,9 +1228,6 @@ 
canvas::tools::mergeViewAndRenderState(com::sun::star::rendering::ViewState, co
 canvas::tools::prependToViewState(com::sun::star::rendering::ViewState, 
basegfx::B2DHomMatrix const)
 canvas::tools::verifyInput(com::sun::star::geometry::RealSize2D const, char 
const*, com::sun::star::uno::Referencecom::sun::star::uno::XInterface const, 
short)
 
canvas::tools::verifyInput(com::sun::star::rendering::FloatingPointBitmapLayout 
const, char const*, 
com::sun::star::uno::Referencecom::sun::star::uno::XInterface const, short)
-chart::EquidistantTickIter::getCurrentIndex() const
-chart::EquidistantTickIter::getMaxIndex() const
-chart::EquidistantTickIter::gotoIndex(int)
 
cmis::Content::exchangeIdentity(com::sun::star::uno::Referencecom::sun::star::ucb::XContentIdentifier
 const)
 cmis::Content::queryChildren(std::__debug::listrtl::Referencecmis::Content, 
std::allocatorrtl::Referencecmis::Content  )
 comphelper::AccessibleEventNotifier::getEventListeners(unsigned int)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Julien Nabet]

 cui/source/customize/acccfg.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a3e9dedc68658bb62f7b58040f6fcaf4e03ed93e
Author: Julien Nabet serval2...@yahoo.fr
Date:   Tue Jan 31 22:49:51 2012 +0100

Fix Throwing a copy of the caught exception instead of rethrowing

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 9a2a918..5c79188 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -885,7 +885,7 @@ void SfxAcceleratorConfigPage::InitAccCfg()
 m_xModule = css::uno::Reference css::ui::XAcceleratorConfiguration 
(xUICfgManager-getShortCutManager(), css::uno::UNO_QUERY_THROW);
 }
 catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+{ throw; }
 catch(const css::uno::Exception)
 { m_xSMGR.clear(); }
 }
@@ -1021,7 +1021,7 @@ void SfxAcceleratorConfigPage::Apply(const 
css::uno::Reference css::ui::XAccele
 xAccMgr-removeKeyEvent(aAWTKey);
 }
 catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+{ throw; }
 catch(const css::uno::Exception)
 {}
 
@@ -1299,7 +1299,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, LoadHdl, 
sfx2::FileDialogHelper*, EMPTYARG
 }
 }
 catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+{ throw; }
 catch(const css::uno::Exception)
 {}
 
@@ -1401,7 +1401,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SaveHdl, 
sfx2::FileDialogHelper*, EMPTYARG
 }
 }
 catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+{ throw; }
 catch(const css::uno::Exception)
 {}
 
@@ -1438,7 +1438,7 @@ sal_Bool SfxAcceleratorConfigPage::FillItemSet( 
SfxItemSet )
 m_xAct-store();
 }
 catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+{ throw;  }
 catch(const css::uno::Exception)
 { return sal_False; }
 
@@ -1527,7 +1527,7 @@ String SfxAcceleratorConfigPage::GetLabel4Command(const 
String sCommand)
 }
 }
 catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+{ throw; }
 catch(const css::uno::Exception)
 {}
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

[Lionel Elie Mamane]

 dbaccess/source/core/api/RowSetCache.cxx |   26 --
 dbaccess/source/core/api/RowSetCache.hxx |2 +-
 2 files changed, 21 insertions(+), 7 deletions(-)

New commits:
commit 5f34f5a8596335d8509fde8fd7ef1ab0418ec3be
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Jan 31 22:53:31 2012 +0100

ORowSetCache: keep m_nEndPos better up-to-date

diff --git a/dbaccess/source/core/api/RowSetCache.cxx 
b/dbaccess/source/core/api/RowSetCache.cxx
index 4cc1811..acd2908 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -452,13 +452,18 @@ void ORowSetCache::setFetchSize(sal_Int32 _nSize)
 else if (m_nStartPos  m_nPosition  m_nPosition = m_nEndPos)
 {
 sal_Int32 nNewSt = -1;
-fillMatrix(nNewSt,_nSize);
+_nSize += m_nStartPos;
+fillMatrix(nNewSt, _nSize);
 if (nNewSt = 0)
 {
 m_nStartPos = nNewSt;
-m_nEndPos =  nNewSt + _nSize;
+m_nEndPos =  _nSize;
 m_aMatrixIter = calcPosition();
 }
+else
+{
+m_nEndPos = m_nStartPos + m_nFetchSize;
+}
 }
 else
 {
@@ -746,7 +751,7 @@ sal_Bool ORowSetCache::afterLast(  )
 return sal_True;
 }
 
-sal_Bool ORowSetCache::fillMatrix(sal_Int32 _nNewStartPos,sal_Int32 
_nNewEndPos)
+sal_Bool ORowSetCache::fillMatrix(sal_Int32 _nNewStartPos, sal_Int32 
_nNewEndPos)
 {
 OSL_ENSURE(_nNewStartPos != _nNewEndPos,ORowSetCache::fillMatrix: 
StartPos and EndPos can not be equal!);
 // If _nNewStartPos = 0, then fill the whole window with new data
@@ -791,7 +796,16 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32 
_nNewStartPos,sal_Int32 _nNewEndPos
 }
 const ORowSetMatrix::iterator aEnd = aIter;
 ORowSetMatrix::iterator aRealEnd = m_pMatrix-end();
-sal_Int32 nPos = (m_nRowCount  m_nFetchSize) ? (m_nRowCount - 
m_nFetchSize) : 0;
+sal_Int32 nPos;
+if (m_nRowCount = m_nFetchSize)
+{
+nPos = m_nRowCount - m_nFetchSize;
+}
+else
+{
+nPos = 0;
+_nNewEndPos = m_nRowCount;
+}
 _nNewStartPos = nPos;
 ++nPos;
 bCheck = m_pCacheSet-absolute(nPos);
@@ -1655,6 +1669,7 @@ void ORowSetCache::deregisterOldRow(const 
TORowSetOldRowHelperRef _rRow)
 
 sal_Bool ORowSetCache::reFillMatrix(sal_Int32 _nNewStartPos,sal_Int32 
_nNewEndPos)
 {
+OSL_ENSURE( _nNewEndPos - _nNewStartPos == m_nFetchSize, reFillMatrix 
called with Start/EndPos not m_nFetchSize apart);
 const TOldRowSetRows::const_iterator aOldRowEnd = m_aOldRows.end();
 for (TOldRowSetRows::iterator aOldRowIter = m_aOldRows.begin(); 
aOldRowIter != aOldRowEnd; ++aOldRowIter)
 {
@@ -1664,8 +1679,7 @@ sal_Bool ORowSetCache::reFillMatrix(sal_Int32 
_nNewStartPos,sal_Int32 _nNewEndPo
 sal_Int32 nNewSt = _nNewStartPos;
 sal_Bool bRet = fillMatrix(nNewSt,_nNewEndPos);
 m_nStartPos = nNewSt;
-m_nEndPos = nNewSt + (_nNewEndPos - _nNewStartPos);
-OSL_ENSURE( _nNewEndPos - _nNewStartPos == m_nFetchSize, reFillMatrix 
called with Start/EndPos not m_nFetchSize apart);
+m_nEndPos = _nNewEndPos;
 
rotateCacheIterator(static_castORowSetMatrix::difference_type(m_nFetchSize+1));
 // invalidate every iterator
 return bRet;
 }
diff --git a/dbaccess/source/core/api/RowSetCache.hxx 
b/dbaccess/source/core/api/RowSetCache.hxx
index fc41495..850849f 100644
--- a/dbaccess/source/core/api/RowSetCache.hxx
+++ b/dbaccess/source/core/api/RowSetCache.hxx
@@ -111,7 +111,7 @@ namespace dbaccess
 
 sal_Bool fill(ORowSetMatrix::iterator _aIter,const 
ORowSetMatrix::const_iterator _aEnd,sal_Int32 _nPos,sal_Bool _bCheck);
 sal_Bool reFillMatrix(sal_Int32 _nNewStartPos,sal_Int32 nNewEndPos);
-sal_Bool fillMatrix(sal_Int32 _nNewStartPos,sal_Int32 _nNewEndPos);
+sal_Bool fillMatrix(sal_Int32 _nNewStartPos,sal_Int32 _nNewEndPos);
 sal_Bool moveWindow();
 // returns true when a keyset needs to be created.
 sal_Bool impl_createBookmarkSet_nothrow(const 
::com::sun::star::uno::Reference ::com::sun::star::sdbc::XResultSet  _xRs);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: svtools/source

[Julien Nabet]

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

New commits:
commit 4d83e7010870fb8d74b19c28f1c4cd3fa616f514
Author: Julien Nabet serval2...@yahoo.fr
Date:   Tue Jan 31 22:56:20 2012 +0100

Fix Possible inefficient checking for 'rChunkData' emptiness

diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx
index bd95ab7..ee1f329 100644
--- a/svtools/source/filter/filter.cxx
+++ b/svtools/source/filter/filter.cxx
@@ -1961,7 +1961,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic 
rGraphic, const String
 if ( aAdditionalChunkSequence[ j 
].Value = aByteSeq )
 {
 std::vector 
vcl::PNGWriter::ChunkData  rChunkData = aPNGWriter.GetChunks();
-if ( rChunkData.size() )
+if ( !rChunkData.empty() )
 {
 sal_uInt32 nChunkLen = 
aByteSeq.getLength();
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - vcl/generic vcl/inc vcl/source vcl/unx

[Olivier Hallot]

 vcl/generic/app/gensys.cxx |2 -
 vcl/generic/glyphs/gcach_ftyp.cxx  |2 -
 vcl/generic/print/common_gfx.cxx   |2 -
 vcl/generic/print/printerjob.cxx   |6 +--
 vcl/inc/generic/gendata.hxx|2 -
 vcl/inc/image.h|2 -
 vcl/source/app/settings.cxx|8 ++--
 vcl/source/app/unohelp.cxx |2 -
 vcl/source/control/edit.cxx|2 -
 vcl/source/control/tabctrl.cxx |8 ++--
 vcl/source/gdi/configsettings.cxx  |2 -
 vcl/source/gdi/gfxlink.cxx |2 -
 vcl/source/gdi/image.cxx   |4 +-
 vcl/source/gdi/impgraph.cxx|4 +-
 vcl/source/gdi/impimage.cxx|6 +--
 vcl/source/gdi/impimagetree.cxx|6 +--
 vcl/source/gdi/pdfwriter_impl.cxx  |   58 ++---
 vcl/source/gdi/pdfwriter_impl2.cxx |4 +-
 vcl/source/gdi/print3.cxx  |   34 -
 vcl/source/gdi/rendergraphic.cxx   |4 +-
 vcl/source/gdi/rendergraphicrasterizer.cxx |2 -
 vcl/source/window/menu.cxx |8 ++--
 vcl/source/window/msgbox.cxx   |2 -
 vcl/source/window/printdlg.cxx |   26 ++---
 vcl/source/window/status.cxx   |   10 ++---
 vcl/source/window/toolbox.cxx  |8 ++--
 vcl/source/window/toolbox2.cxx |2 -
 vcl/source/window/window.cxx   |4 +-
 vcl/unx/generic/app/saldata.cxx|2 -
 vcl/unx/generic/app/sm.cxx |2 -
 vcl/unx/generic/app/wmadaptor.cxx  |6 +--
 vcl/unx/generic/dtrans/X11_selection.cxx   |6 +--
 32 files changed, 119 insertions(+), 119 deletions(-)

New commits:
commit 634820b3a8604dd1ed868ddeffc2501f3a0f056f
Author: Olivier Hallot olivier.hal...@alta.org.br
Date:   Tue Jan 31 17:53:23 2012 -0200

Fix for fdo43460 Part LVIII getLength() to isEmpty()

Part LVIII
Modules
vcl (part 2)

diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx 
b/vcl/source/gdi/pdfwriter_impl2.cxx
index 0364a9f..71378a6 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -1214,14 +1214,14 @@ uno::Reference beans::XMaterialHolder  
PDFWriterImpl::initEncryption( const rt
 )
 {
 uno::Reference beans::XMaterialHolder  xResult;
-if( i_rOwnerPassword.getLength() || i_rUserPassword.getLength() )
+if( !i_rOwnerPassword.isEmpty() || !i_rUserPassword.isEmpty() )
 {
 EncHashTransporter* pTransporter = new EncHashTransporter;
 xResult = pTransporter;
 
 // get padded passwords
 sal_uInt8 aPadUPW[ENCRYPTED_PWD_SIZE], aPadOPW[ENCRYPTED_PWD_SIZE];
-padPassword( i_rOwnerPassword.getLength() ? i_rOwnerPassword : 
i_rUserPassword, aPadOPW );
+padPassword( i_rOwnerPassword.isEmpty() ? i_rUserPassword : 
i_rOwnerPassword, aPadOPW );
 padPassword( i_rUserPassword, aPadUPW );
 sal_Int32 nKeyLength = SECUR_40BIT_KEY;
 if( b128Bit )
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 60b449e..a51b039 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -359,7 +359,7 @@ void Printer::ImplPrintJob( const 
boost::shared_ptrPrinterController i_pContr
 {
 rtl::OUString aPagesVal;
 pPagesVal-Value = aPagesVal;
-if( aPagesVal.getLength() )
+if( !aPagesVal.isEmpty() )
 {
 // Pages attribute from API is now equivalent to PageRange
 // AND PrintContent = 1 except calc where it is PrintRange = 1
@@ -384,7 +384,7 @@ void Printer::ImplPrintJob( const 
boost::shared_ptrPrinterController i_pContr
 rtl::OUString aRange;
 if( pRangeVal )
 pRangeVal-Value = aRange;
-if( aRange.getLength() == 0 )
+if( aRange.isEmpty() )
 {
 sal_Int32 nPages = i_pController-getPageCount();
 if( nPages  0 )
@@ -442,7 +442,7 @@ void Printer::ImplPrintJob( const 
boost::shared_ptrPrinterController i_pContr
 if( aDlg.isPrintToFile() )
 {
 rtl::OUString aFile = queryFile( 
pController-getPrinter().get() );
-if( ! aFile.getLength() )
+if( aFile.isEmpty() )
 {
 i_pController-abortJob();
 return;
@@ -526,7 +526,7 @@ bool Printer::StartJob( const rtl::OUString i_rJobName, 
boost::shared_ptrvcl::
 {
 rtl::OUString aFile;
 pFileValue-Value = aFile;
-if( aFile.getLength() )
+if( !aFile.isEmpty() )
 {
 mbPrintFile = sal_True;
 maPrintFile = aFile;
@@ -1336,7 +1336,7 @@ void 

[Libreoffice-commits] .: Branch 'feature/android' - android/qa

[Michael Meeks]

 android/qa/desktop/Makefile |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit c94c9dbdcfc8435f0df61fd326dc25d39d3c44cb
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Jan 31 22:24:08 2012 +

android: package missing libraries, and shell branding - we get a shell.

diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 3475248..553aefe 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -113,10 +113,9 @@ copy-stuff: buildrcs
  comphelpgcc3 \
  configmgr.uno \
  cppcanvaslo \
- deployment \
- deploymentmisclo \
  drawinglayerlo \
  editenglo \
+ expwrap.uno \
  fileacc \
  fontconfig \
  forlo \
@@ -125,6 +124,7 @@ copy-stuff: buildrcs
  fwelo \
  fwilo \
  fwklo \
+ fsstorage.uno \
  gcc3_uno \
  i18nisolang1gcc3 \
  i18npaperlo \
@@ -187,6 +187,9 @@ copy-stuff: buildrcs
  ); do \
$(call COPY,$(OUTDIR)/lib/lib$${F}.so); \
done
+#deployment \
+#deploymentmisclo \
+
 #
 # Then the shared GNU C++ library
$(call 
COPY,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so)
@@ -218,6 +221,8 @@ copy-stuff: buildrcs
mkdir -p assets/presets/$$D ; \
echo content  assets/presets/$$D/stamp; \
done
+# shell / splash images
+   cp -r $(SRC_ROOT)/icon-themes/galaxy/brand/* assets/program
 # 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
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 filter/source/xsltfilter/LibXSLTTransformer.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8558246af43c01bc437c4884e5ff144d714dc848
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Tue Jan 31 21:44:00 2012 +0100

don't delete thread while it is still running, fdo#45401

Signed-off-by: Kohei Yoshida kohei.yosh...@suse.com
(cherry picked from commit 3c9bf1c2f9ca970bc6d9c971c5a27a031aca884c)

Signed-off-by: Peter Jentsch pj...@guineapics.de
Signed-off-by: Eike Rathke er...@redhat.com

diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx 
b/filter/source/xsltfilter/LibXSLTTransformer.cxx
index 72c31c1..599b80c 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx
@@ -485,6 +485,7 @@ namespace XSLT
 LibXSLTTransformer::terminate() throw (RuntimeException)
 {
 m_Reader-terminate();
+m_Reader-join();
 delete(m_Reader);
 m_parameters.clear();
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 5 commits - dbaccess/source oox/Library_oox.mk starmath/inc starmath/source vcl/source

[Caolán McNamara]

 dbaccess/source/ui/misc/TokenWriter.cxx |5 ++---
 oox/Library_oox.mk  |5 -
 starmath/inc/rect.hxx   |   11 ++-
 starmath/source/rect.cxx|   27 ---
 vcl/source/gdi/print3.cxx   |2 +-
 5 files changed, 25 insertions(+), 25 deletions(-)

New commits:
commit a20a1d8e0c6f0710a475ff1fef0b325a62f8237a
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jan 31 22:46:41 2012 +

maUIOptions is a Sequence not a string

diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index a51b039..32ae196 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -1336,7 +1336,7 @@ void PrinterController::setValue( const 
beans::PropertyValue i_rValue )
 
 void PrinterController::setUIOptions( const Sequence beans::PropertyValue  
i_rOptions )
 {
-DBG_ASSERT( mpImplData-maUIOptions.isEmpty(), setUIOptions called twice 
! );
+DBG_ASSERT( mpImplData-maUIOptions.getLength() == 0, setUIOptions called 
twice ! );
 
 mpImplData-maUIOptions = i_rOptions;
 
commit 970ccf4f69080e827008b5da8d8640c202b42306
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jan 31 22:42:22 2012 +

drop unnecessary includes

diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx
index 57cceba..80542df 100644
--- a/starmath/inc/rect.hxx
+++ b/starmath/inc/rect.hxx
@@ -31,6 +31,7 @@
 
 #include new
 
+#include rtl/ustring.hxx
 #include tools/gen.hxx
 #include vcl/outdev.hxx
 #include vcl/metric.hxx
@@ -39,9 +40,9 @@
 
 
 bool SmGetGlyphBoundRect(const OutputDevice rDev,
- const XubString rText, Rectangle rRect);
+ const rtl::OUString rText, Rectangle rRect);
 
-bool SmIsMathAlpha(const XubString rText);
+bool SmIsMathAlpha(const rtl::OUString rText);
 
 
 inline long SmFromTo(long nFrom, long nTo, double fRelDist)
@@ -109,9 +110,9 @@ class SmRect
 
 protected:
 void BuildRect (const OutputDevice rDev, const SmFormat *pFormat,
-const XubString rText, sal_uInt16 nBorderWidth);
+const rtl::OUString rText, sal_uInt16 
nBorderWidth);
 void Init(const OutputDevice rDev, const SmFormat *pFormat,
-  const XubString rText, sal_uInt16 nBorderWidth);
+  const rtl::OUString rText, sal_uInt16 nBorderWidth);
 
 void ClearBaseline(){ bHasBaseline = false; };
 inline  void CopyMBL(const SmRect rRect);
@@ -122,7 +123,7 @@ protected:
 public:
 SmRect();
 SmRect(const OutputDevice rDev, const SmFormat *pFormat,
-   const XubString rText, long nBorderWidth);
+   const rtl::OUString rText, long nBorderWidth);
 SmRect(long nWidth, long nHeight);
 SmRect(const SmRect rRect);
 
diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx
index 52f367f..879988c 100644
--- a/starmath/source/rect.cxx
+++ b/starmath/source/rect.cxx
@@ -26,9 +26,6 @@
  *
  /
 
-
-
-#include tools/string.hxx
 #include osl/diagnose.h
 #include vcl/svapp.hxx
 #include vcl/wrkwin.hxx
@@ -60,14 +57,14 @@ static xub_Unicode const aMathAlpha[] =
 xub_Unicode('\0')
 };
 
-bool SmIsMathAlpha(const XubString rText)
+bool SmIsMathAlpha(const rtl::OUString rText)
 // true iff symbol (from StarMath Font) should be treated as letter
 {
-if (rText.Len() == 0)
+if (rText.isEmpty())
 return false;
 
-OSL_ENSURE(rText.Len() == 1, Sm : string must be exactly one character 
long);
-xub_Unicode cChar = rText.GetChar(0);
+OSL_ENSURE(rText.getLength() == 1, Sm : string must be exactly one 
character long);
+xub_Unicode cChar = rText[0];
 
 // is it a greek symbol?
 if (xub_Unicode(0xE0AC) = cCharcChar = xub_Unicode(0xE0D4))
@@ -138,7 +135,7 @@ void SmRect::CopyAlignInfo(const SmRect rRect)
 
 
 void SmRect::BuildRect(const OutputDevice rDev, const SmFormat *pFormat,
-   const XubString rText, sal_uInt16 nBorder)
+   const rtl::OUString rText, sal_uInt16 nBorder)
 {
 OSL_ENSURE(aTopLeft == Point(0, 0), Sm: Ooops...);
 
@@ -227,13 +224,13 @@ void SmRect::BuildRect(const OutputDevice rDev, const 
SmFormat *pFormat,
 if (nLoAttrFence  GetBottom())
 nLoAttrFence = GetBottom();
 
-OSL_ENSURE(rText.Len() == 0  ||  !IsEmpty(),
+OSL_ENSURE(rText.isEmpty() || !IsEmpty(),
Sm: empty rectangle created);
 }
 
 
 void SmRect::Init(const OutputDevice rDev, const SmFormat *pFormat,
-  const XubString rText, sal_uInt16 nEBorderWidth)
+  const rtl::OUString rText, sal_uInt16 nEBorderWidth)
 // get rectangle fitting for drawing 'rText' on OutputDevice 'rDev'
 {
 BuildRect(rDev, pFormat, rText, nEBorderWidth);
@@ -241,7 +238,7 @@ void SmRect::Init(const 

[Libreoffice-commits] .: oox/Library_oox.mk

[René Engelhard]

 oox/Library_oox.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8d2ec1da0449271888d8912306ad8e8a9220c5a2
Author: Rene Engelhard r...@debian.org
Date:   Tue Jan 31 23:57:37 2012 +0100

fix -Os comment in oox/Library_oox.mk

diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 6e4b60e..0171b4e 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -41,9 +41,9 @@ $(eval $(call gb_Library_set_include,oox,\
 ))
 
 ifeq ($(COM)-$(OS)-$(CPUNAME),GCC-LINUX-IA64)
-#Debian Linux ia64 fails at compile time on
-#oox/source/drawingml/customshapepresets*.cxx which are apparently too large
-#for the toolchain to handle with default optimization
+# at least Debian Linux ia64 fails at compile time on
+# link libooxlo.so which is apparently too large
+# for the toolchain to handle with default optimization
 $(eval $(call gb_Library_add_cxxflags,oox,\
 -Os \
 ))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - i18npool/inc i18npool/source svtools/source

[Eike Rathke]

 i18npool/inc/i18npool/lang.h|2 ++
 i18npool/source/isolang/isolang.cxx |2 ++
 svtools/source/misc/langtab.src |2 ++
 3 files changed, 6 insertions(+)

New commits:
commit 4bee7187cd8df7b6e8f71b4c45ef6af7af837f2c
Author: Eike Rathke er...@redhat.com
Date:   Wed Feb 1 00:15:59 2012 +0100

corrections to Komi languages patch

* Changed LCID 0x0A69 to 0x066A to comply with the user-assigned space.
* Added RU country for mapping to locales' ISO codes.
  * All locales should consist of language and country, except those where 
the
language is not mappable to any country.

diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index 502afdd..49cf2bc 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -539,7 +539,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_PALI_LATIN0x0667
 #define LANGUAGE_USER_KYRGYZ_CHINA  0x0668  /* not derived from 
LANGUAGE_KIRGHIZ as these may be different scripts, see 
http://www.omniglot.com/writing/kirghiz.htm */
 #define LANGUAGE_USER_KOMI_ZYRIAN   0x0669
-#define LANGUAGE_USER_KOMI_PERMYAK  0x0A69
+#define LANGUAGE_USER_KOMI_PERMYAK  0x066A
 
 #endif /* INCLUDED_I18NPOOL_LANG_H */
 
diff --git a/i18npool/source/isolang/isolang.cxx 
b/i18npool/source/isolang/isolang.cxx
index 00af58c..2207512 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -483,8 +483,8 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_KEYID, qtz,},   // key id 
pseudolanguage used for UI testing
 { LANGUAGE_USER_PALI_LATIN,pli,},   // Pali with Latin 
script
 { LANGUAGE_USER_KYRGYZ_CHINA,   ky, CN },
-{ LANGUAGE_USER_KOMI_ZYRIAN,   kpv,},
-{ LANGUAGE_USER_KOMI_PERMYAK,  koi,},
+{ LANGUAGE_USER_KOMI_ZYRIAN,   kpv, RU },
+{ LANGUAGE_USER_KOMI_PERMYAK,  koi, RU },
 { LANGUAGE_NONE,   zxx,},   // added to ISO 
639-2 on 2006-01-11: Used to declare the absence of linguistic information
 { LANGUAGE_DONTKNOW,,  }// marks end of 
table
 };
commit 38b94d743eceb7bcc69acbed0207a51f780dbd4c
Author: Harri Pitkänen hatap...@iki.fi
Date:   Fri Jan 27 20:28:45 2012 +0200

Support Komi-Zyrian and Komi-Permyak as text language for spell checking

diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index 177d2a7..502afdd 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -538,6 +538,8 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_KEYID 0x0666  /* key id pseudolanguage */
 #define LANGUAGE_USER_PALI_LATIN0x0667
 #define LANGUAGE_USER_KYRGYZ_CHINA  0x0668  /* not derived from 
LANGUAGE_KIRGHIZ as these may be different scripts, see 
http://www.omniglot.com/writing/kirghiz.htm */
+#define LANGUAGE_USER_KOMI_ZYRIAN   0x0669
+#define LANGUAGE_USER_KOMI_PERMYAK  0x0A69
 
 #endif /* INCLUDED_I18NPOOL_LANG_H */
 
diff --git a/i18npool/source/isolang/isolang.cxx 
b/i18npool/source/isolang/isolang.cxx
index 610ea7f..00af58c 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -483,6 +483,8 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_KEYID, qtz,},   // key id 
pseudolanguage used for UI testing
 { LANGUAGE_USER_PALI_LATIN,pli,},   // Pali with Latin 
script
 { LANGUAGE_USER_KYRGYZ_CHINA,   ky, CN },
+{ LANGUAGE_USER_KOMI_ZYRIAN,   kpv,},
+{ LANGUAGE_USER_KOMI_PERMYAK,  koi,},
 { LANGUAGE_NONE,   zxx,},   // added to ISO 
639-2 on 2006-01-11: Used to declare the absence of linguistic information
 { LANGUAGE_DONTKNOW,,  }// marks end of 
table
 };
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 01b2846..fc83ec7 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -344,6 +344,8 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
  KeyID ; LANGUAGE_USER_KEYID ;  ;
  Pali Latin ; LANGUAGE_USER_PALI_LATIN ;  ;
  Kyrgyz (China) ; LANGUAGE_USER_KYRGYZ_CHINA ;  ;
+ Komi-Zyrian ; LANGUAGE_USER_KOMI_ZYRIAN ;  ;
+ Komi-Permyak ; LANGUAGE_USER_KOMI_PERMYAK ;  ;
 };
 };
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 6 commits - canvas/inc canvas/source sal/inc vcl/source

[David Tardon]

 canvas/inc/canvas/vclwrapper.hxx |2 --
 canvas/source/cairo/cairo_xlib_cairo.cxx |3 ++-
 sal/inc/sal/log-areas.dox|1 +
 vcl/source/gdi/virdev.cxx|   26 --
 4 files changed, 19 insertions(+), 13 deletions(-)

New commits:
commit 4ecc4a91e1199e061a4561f2eaf577085064658f
Author: David Tardon dtar...@redhat.com
Date:   Tue Jan 31 13:37:24 2012 +0100

remove duplicate include

diff --git a/canvas/inc/canvas/vclwrapper.hxx b/canvas/inc/canvas/vclwrapper.hxx
index cf42e15..f6d5b3a 100644
--- a/canvas/inc/canvas/vclwrapper.hxx
+++ b/canvas/inc/canvas/vclwrapper.hxx
@@ -30,10 +30,8 @@
 #define INCLUDED_CANVAS_VCLWRAPPER_HXX
 
 #include osl/mutex.hxx
-#include osl/mutex.hxx
 #include vcl/svapp.hxx
 
-
 namespace canvas
 {
 namespace vcltools
commit b9accbafa13b0ffb8855d3ae732b397f6120a3cb
Author: David Tardon dtar...@redhat.com
Date:   Tue Jan 31 11:51:18 2012 +0100

the bug number is not from public bugzilla

diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 6cde626..3165d35 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -168,7 +168,7 @@ VirtualDevice::VirtualDevice( const OutputDevice rCompDev, 
sal_uInt16 nBitCount
 
 ImplInitVirDev( rCompDev, 1, 1, nBitCount );
 
-// #110958# Enable alpha channel
+// Enable alpha channel
 mnAlphaDepth = sal::static_int_castsal_Int8(nAlphaBitCount);
 }
 
commit 4f6a5040db04a59498d2ef2b729659a94140c23b
Author: David Tardon dtar...@redhat.com
Date:   Tue Jan 31 10:52:10 2012 +0100

the depth argument must be = 0

diff --git a/canvas/source/cairo/cairo_xlib_cairo.cxx 
b/canvas/source/cairo/cairo_xlib_cairo.cxx
index e084eda..df14fce 100644
--- a/canvas/source/cairo/cairo_xlib_cairo.cxx
+++ b/canvas/source/cairo/cairo_xlib_cairo.cxx
@@ -26,6 +26,7 @@
  *
  /
 
+#include utility
 
 #include tools/prex.h
 #include X11/extensions/Xrender.h
@@ -267,7 +268,7 @@ namespace cairo
 aSystemGraphicsData.pXRenderFormat = getRenderFormat();
 
 return boost::shared_ptrVirtualDevice(
-new VirtualDevice( aSystemGraphicsData, getDepth() ));
+new VirtualDevice( aSystemGraphicsData, std::max( getDepth(), 0 ) 
));
 }
 
 /**
commit 767098b0ca717b6649223940af907593723bc927
Author: David Tardon dtar...@redhat.com
Date:   Tue Jan 31 10:52:38 2012 +0100

add vcl.gdi log area

diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index d0cbaee..074f1b2 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -19,6 +19,7 @@ certain functionality.
 
 @section VCL
 
+@li vcl.gdi - the GDI part of VCL: devices, bitmaps, etc.
 @li vcl.gtk - Gtk+ 2/3 plugin
 
 @section Writer
commit ec505d879eaf59815dfc912c2dda525fbf5f2340
Author: David Tardon dtar...@redhat.com
Date:   Tue Jan 31 11:42:23 2012 +0100

OSL_TRACE - SAL_INFO

diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 3f6acf3..6cde626 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -137,7 +137,7 @@ VirtualDevice::VirtualDevice( sal_uInt16 nBitCount )
 {
 SAL_WARN_IF( nBitCount  1, vcl.gdi,
 VirtualDevice::VirtualDevice(): Only 0 or 1 is for BitCount 
allowed );
-OSL_TRACE( VirtualDevice::VirtualDevice( %hu ), nBitCount );
+SAL_INFO( vcl.gdi, VirtualDevice::VirtualDevice(   nBitCount   ) 
);
 
 ImplInitVirDev( Application::GetDefaultDevice(), 1, 1, nBitCount );
 }
@@ -150,7 +150,7 @@ VirtualDevice::VirtualDevice( const OutputDevice rCompDev, 
sal_uInt16 nBitCount
 {
 SAL_WARN_IF( nBitCount  1, vcl.gdi,
 VirtualDevice::VirtualDevice(): Only 0 or 1 is for BitCount 
allowed );
-OSL_TRACE( VirtualDevice::VirtualDevice( %hu ), nBitCount );
+SAL_INFO( vcl.gdi, VirtualDevice::VirtualDevice(   nBitCount   ) 
);
 
 ImplInitVirDev( rCompDev, 1, 1, nBitCount );
 }
@@ -163,7 +163,8 @@ VirtualDevice::VirtualDevice( const OutputDevice rCompDev, 
sal_uInt16 nBitCount
 {
 SAL_WARN_IF( nBitCount  1, vcl.gdi,
 VirtualDevice::VirtualDevice(): Only 0 or 1 is for BitCount 
allowed );
-OSL_TRACE( VirtualDevice::VirtualDevice( %hu ), nBitCount );
+SAL_INFO( vcl.gdi,
+VirtualDevice::VirtualDevice(   nBitCount  ,   
nAlphaBitCount   ) );
 
 ImplInitVirDev( rCompDev, 1, 1, nBitCount );
 
@@ -177,7 +178,7 @@ VirtualDevice::VirtualDevice( const SystemGraphicsData 
*pData, sal_uInt16 nBitCo
 :   mpVirDev( NULL ),
 meRefDevMode( REFDEV_NONE )
 {
-OSL_TRACE( VirtualDevice::VirtualDevice( %hu ), nBitCount );
+SAL_INFO( vcl.gdi, VirtualDevice::VirtualDevice(   nBitCount   ) 
);
 
 ImplInitVirDev( Application::GetDefaultDevice(), 1, 1, nBitCount, pData );
 }
@@ -186,7 +187,7 @@ VirtualDevice::VirtualDevice( const SystemGraphicsData 
*pData, sal_uInt16 nBitCo
 
 VirtualDevice::~VirtualDevice()
 {
-OSL_TRACE( 

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

[Muthu Subramanian]

 sc/source/ui/app/scdll.cxx   |2 
 sc/source/ui/inc/tabvwsh.hxx |4 +
 sc/source/ui/view/formatsh.cxx   |9 +-
 sc/source/ui/view/tabvwsh4.cxx   |1 
 svx/inc/svx/tbcontrl.hxx |  132 ---
 svx/source/tbxctrls/tbcontrl.cxx |   60 ++---
 6 files changed, 116 insertions(+), 92 deletions(-)

New commits:
commit 4daa3f54437730fe4e509082faa0d3509c62cea0
Author: Winfried Donkers w.donk...@dci-electronics.nl
Date:   Wed Feb 1 13:17:26 2012 +0530

fdo#34425: [Feature] Persist bgcolor toolbar button.

This is to avoid background color selection evertime.

diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 0a57bf6..4675a2e 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -204,7 +204,7 @@ void ScDLL::Init()
 SvxFontNameToolBoxControl   ::RegisterControl(SID_ATTR_CHAR_FONT,  
 pMod);
 //  SvxFontHeightToolBoxControl 
::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod);
 SvxFontColorToolBoxControl  ::RegisterControl(SID_ATTR_CHAR_COLOR, 
 pMod);
-SvxColorToolBoxControl  ::RegisterControl(SID_BACKGROUND_COLOR,
 pMod);
+SvxFontColorExtToolBoxControl   ::RegisterControl(SID_BACKGROUND_COLOR,
 pMod);
 SvxFrameToolBoxControl  ::RegisterControl(SID_ATTR_BORDER, 
 pMod);
 SvxFrameLineStyleToolBoxControl ::RegisterControl(SID_FRAME_LINESTYLE, 
 pMod);
 SvxFrameLineColorToolBoxControl ::RegisterControl(SID_FRAME_LINECOLOR, 
 pMod);
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 05e6838..1bd0fb1 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -108,6 +108,7 @@ private:
 static sal_uInt16   nInsertCtrlState;
 static sal_uInt16   nInsCellsCtrlState;
 static sal_uInt16   nInsObjCtrlState;
+static ColoraBackgroundColor;
 
 SvxHtmlOptions  aHTMLOpt;
 ObjectSelectionType eCurOST;
@@ -423,6 +424,9 @@ public:
 
 boolExecuteRetypePassDlg(ScPasswordHash eDesiredHash);
 
+voidSetBackgroundColor( const Color aCol ) { aBackgroundColor = aCol; 
}
+Color   GetBackgroundColor(){ return aBackgroundColor; 
}
+
 using ScTabView::ShowCursor;
 
 // ugly hack to call Define Names from Manage Names
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 1718741..bbb44ae 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -1452,13 +1452,12 @@ void ScFormatShell::ExecuteAttr( SfxRequest rReq )
 
 case SID_BACKGROUND_COLOR:
 {
-//  SID_BACKGROUND_COLOR without arguments - set 
transparent background
-
+//  SID_BACKGROUND_COLOR without arguments - set 
background to last used color
 SvxBrushItemaBrushItem( (const SvxBrushItem)
 
pTabViewShell-GetSelectionPattern()-
 GetItem( ATTR_BACKGROUND ) );
 
-aBrushItem.SetColor( COL_TRANSPARENT );
+aBrushItem.SetColor( pTabViewShell-GetBackgroundColor()  
);
 
 pTabViewShell-ApplyAttr( aBrushItem );
 }
@@ -1643,7 +1642,9 @@ void ScFormatShell::ExecuteAttr( SfxRequest rReq )
 
pTabViewShell-GetSelectionPattern()-
 GetItem( ATTR_BACKGROUND ) );
 
-aBrushItem.SetColor( rNewColorItem.GetValue() );
+Color aSet = rNewColorItem.GetValue();
+pTabViewShell-SetBackgroundColor( aSet );
+aBrushItem.SetColor( aSet );
 
 pTabViewShell-ApplyAttr( aBrushItem );
 }
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index f8e2ab8..5ad0d03 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -109,6 +109,7 @@ using namespace com::sun::star;
 sal_uInt16 ScTabViewShell::nInsertCtrlState = SID_INSERT_GRAPHIC;
 sal_uInt16 ScTabViewShell::nInsCellsCtrlState = 0;
 sal_uInt16 ScTabViewShell::nInsObjCtrlState = SID_INSERT_DIAGRAM;
+Color  ScTabViewShell::aBackgroundColor = COL_TRANSPARENT;
 
 // ---
 
diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx
index cdbd93b..32f218d 100644
--- a/svx/inc/svx/tbcontrl.hxx
+++ b/svx/inc/svx/tbcontrl.hxx
@@ -104,7 +104,7 @@
 Note:   Analysis of BrushItem:
 Brush-FillColor() is misused as switch,
 to distinguish whether a new style
-   or a new color has been set
+or a new color has been set
 
 GetFillColor() == 

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

[Stephan Bergmann]

 connectivity/source/drivers/odbcbase/OStatement.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 71d9ebb51be70aca30a2d12c52e6000fbb900d44
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Sun Jan 29 19:48:40 2012 +0100

remove erroneously committed debug code

(cherry picked from commit ab2fb9c4f95f13a1579e0ac199a109d082fbe945)

Conflicts:
connectivity/source/drivers/odbcbase/OStatement.cxx

Signed-off-by: Stephan Bergmann sberg...@redhat.com

diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx 
b/connectivity/source/drivers/odbcbase/OStatement.cxx
index 3c3c83a..f09a08a 100644
--- a/connectivity/source/drivers/odbcbase/OStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OStatement.cxx
@@ -828,7 +828,6 @@ void OStatement_Base::setResultSetType(sal_Int32 _par0)
 nSet =  SQL_SENSITIVE;
 break;
 default:
-fprintf(stderr, _par0=%d\n, _par0);
 OSL_FAIL( OStatement_Base::setResultSetType: invalid result set 
type! );
 break;
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oox/source

[Muthu Subramanian]

 oox/source/drawingml/diagram/diagram.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit af15127871d38a862ce300ceda5cc74624fda8df
Author: Muthu Subramanian sumu...@suse.com
Date:   Wed Feb 1 13:32:56 2012 +0530

Fixes crashing while loading manipulated pptx files.

diff --git a/oox/source/drawingml/diagram/diagram.cxx 
b/oox/source/drawingml/diagram/diagram.cxx
index 91a475f..9194001 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -340,7 +340,8 @@ void Diagram::addTo( const ShapePtr  pParentShape )
 
 // create Shape hierarchy
 ShapeCreationVisitor aCreationVisitor(pParentShape, *this);
-mpLayout-getNode()-accept(aCreationVisitor);
+if( mpLayout-getNode() )
+mpLayout-getNode()-accept( aCreationVisitor );
 }
 
 OUString Diagram::getLayoutId() const
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits